#---- subs ----
+sub status {
+ my $text = shift;
+ $text =~ s{\s+$}{};
+ my $new = $0;
+ $new =~ s{^[\w\/]+/(\w+) }{$1 }; # strip path from process name
+ if ( $text =~ m/^\|/ ) {
+ $new =~ s/\|.*/$text/ or $new .= " $text";
+ } else {
+ $new =~ s/\s+.*/ $text/ or $new .= " $text";
+ }
+ $0 = $new;
+}
+
sub fmt_time {
my $t = shift || return;
my $out = "";
}
print "$added";
+ status "| $added";
$offset += EST_CHUNK;
$dbh->do( qq{ CREATE SEQUENCE $seq } );
}
-=for later
-
print " creating triggers ";
$dbh->do( <<__END_OF_TRIGGER__ );
__END_OF_TRIGGER__
-=cut
-
print "...\n";
$dbh->commit;
});
$sth->{hosts_by_name} = $dbh->prepare(qq{
-SELECT ID FROM hosts WHERE name=?
+SELECT id FROM hosts WHERE name=?
});
$sth->{backups_count} = $dbh->prepare(qq{
fmt_time($backup->{endTime} - $backup->{startTime})
);
print $share_header unless $opt->quiet;
+ status "$hostname $backupNum $share_header";
- my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_first => 1 });
+ my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_increment => 1 });
foreach my $share ($files->shareList($backupNum)) {
}
my $dur = (time() - $t) || 1;
- printf(" %d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]\n",
+ my $status = sprintf("%d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]",
$nf, $f, $nd, $d,
($size / 1024 / 1024),
( ($f+$d) / $dur ),
fmt_time($dur)
);
+ print " $status\n";
+ status "$hostname $backupNum $status";
if ($nf + $nd > 0) {
- eval { hest_update($hostID, $shareID, $backupNum) };
- warn "ERROR: $@" if $@;
+ status "$hostname $backupNum full-text | indexing";
+ #eval { hest_update($hostID, $shareID, $backupNum) };
+ #warn "ERROR: $@" if $@;
+ hest_update($hostID, $shareID, $backupNum);
+ # eval breaks our re-try logic
}
}