r11672@llin: dpavlin | 2005-12-13 20:28:54 +0100

 final logging tweaks

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@271 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index 6dd87b8..60eccf9 100755 (executable)
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -298,6 +298,9 @@ my $num_backups = $sth->rows;
 my $curr_backup = 1;
 
 while (my $row = $sth->fetchrow_hashref) {
+
+       $curr_backup++;
+
        my $tar_file = BackupPC::SearchLib::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'});
 
        # this will return -1 if file doesn't exist
@@ -313,8 +316,7 @@ while (my $row = $sth->fetchrow_hashref) {
                }
        }
 
-       print curr_time, " $curr_backup/$num_backups ", $row->{'host'}, ":", $row->{'share'}, " #", $row->{'num'}, " -> $tar_file";
-       $curr_backup++;
+       print curr_time, " creating $curr_backup/$num_backups ", $row->{'host'}, ":", $row->{'share'}, " #", $row->{'num'}, " -> $tar_file";
 
        my $t = time();
 

diff --git a/bin/BackupPC_tarIncCreate b/bin/BackupPC_tarIncCreate
index 7704eaa..fe77418 100755 (executable)
--- a/bin/BackupPC_tarIncCreate
+++ b/bin/BackupPC_tarIncCreate
@@ -252,7 +252,7 @@ sub new_tar_part {
        if ($fh) {
                return if ($current_tar_size == 0);
 
-               print STDERR " $part";
+               print STDERR "\n\t+ $part:";
 
                #
                # Finish with two null 512 byte headers,
@@ -271,6 +271,8 @@ sub new_tar_part {
 
                my $size = (stat( $file . '.tar.gz' ))[7] || die "can't stat ${file}.tar.gz";
 
+               print "$file, $size bytes, $items_in_part items";
+
                $sth_backup_parts->execute(
                        $backup_id,
                        $part,
@@ -312,7 +314,7 @@ sub new_tar_part {
                                $backup_id
                        );
 
-                       print STDERR ", $total_increment_size bytes\n" if ($opts{v});
+                       print "\n\ttotal $total_increment_size bytes";
 
                        return;
                }