X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famvault.pl;h=87a43fb95790c2aacf3c5862a2062f37ff6adb51;hb=refs%2Ftags%2Fupstream%2F3.3.1;hp=8b2c87a66e6b4fbd20112190c1d521f104d981e6;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda

diff --git a/server-src/amvault.pl b/server-src/amvault.pl
index 8b2c87a..87a43fb 100644
--- a/server-src/amvault.pl
+++ b/server-src/amvault.pl
@@ -93,7 +93,7 @@ sub user_request {
 package Amvault;
 
 use Amanda::Config qw( :getconf config_dir_relative );
-use Amanda::Debug qw( :logging );
+use Amanda::Debug qw( :logging debug );
 use Amanda::Xfer qw( :constants );
 use Amanda::Header qw( :constants );
 use Amanda::MainLoop;
@@ -108,8 +108,8 @@ use Amanda::Changer qw( :constants );
 use Amanda::Cmdline;
 use Amanda::Paths;
 use Amanda::Logfile qw( :logtype_t log_add log_add_full
-			log_rename $amanda_log_trace_log make_stats
-			match_datestamp match_level );
+			log_rename $amanda_log_trace_log make_stats );
+use Amanda::Util qw ( match_datestamp match_level );
 
 use base qw(
     Amanda::Recovery::Clerk::Feedback
@@ -313,7 +313,7 @@ sub plan_cb {
 		      $dump->{'dump_timestamp'} . " " .
 		      $dump->{'level'} . "\n";
 	    }
-	    $total_kb += $dump->{'kb'};
+	    $total_kb += int $dump->{'kb'};
 	}
 
 	print STDOUT "Total Size: $total_kb KB\n";
@@ -630,6 +630,14 @@ sub quit {
     };
 
     step roll_log => sub {
+	if (defined $self->{'src'}->{'chg'}) {
+	    $self->{'src'}->{'chg'}->quit();
+	    $self->{'src'}->{'chg'} = undef;
+	}
+	if (defined $self->{'dst'}->{'chg'}) {
+	    $self->{'dst'}->{'chg'}->quit();
+	    $self->{'dst'}->{'chg'} = undef;
+	}
 	if ($self->{'cleanup'}{'roll_trace_log'}) {
 	    log_add_full($L_FINISH, "driver", "fake driver finish");
 	    log_add($L_INFO, "pid-done $$");
@@ -740,6 +748,7 @@ sub scribe_notif_log_info {
     my $self = shift;
     my %params = @_;
 
+    debug("$params{'message'}");
     log_add_full($L_INFO, "taper", $params{'message'});
 }
 
@@ -942,6 +951,7 @@ sub add_autolabel {
     usage("unknown --autolabel value '$val'");
 }
 
+debug("Arguments: " . join(' ', @ARGV));
 Getopt::Long::Configure(qw{ bundling });
 GetOptions(
     'o=s' => sub {