* Commit for 2.1.0.

[BackupPC.git] / bin / BackupPC_archive

diff --git a/bin/BackupPC_archive b/bin/BackupPC_archive
index 8a7683a..6ab75ea 100644 (file)
--- a/bin/BackupPC_archive
+++ b/bin/BackupPC_archive
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0beta2, released 23 May 2004.
+# Version 2.1.0, released 20 Jun 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -241,12 +241,18 @@ sub ArchiveCleanup
 
     if ( !$stat{xferOK} ) {
        #
-       # kill off the tranfer program, first nicely then forcefully
+       # Kill off the tranfer program, first nicely then forcefully.
+       # We use negative PIDs to make sure all processes in each
+       # group get the signal.
        #
        if ( @xferPid ) {
-           kill($bpc->sigName2num("INT"), @xferPid);
+           foreach my $pid ( @xferPid ) {
+               kill($bpc->sigName2num("INT"), -$pid);
+           }
            sleep(1);
-           kill($bpc->sigName2num("KILL"), @xferPid);
+           foreach my $pid ( @xferPid ) {
+               kill($bpc->sigName2num("KILL"), -$pid);
+           }
        }
     }
 
@@ -272,11 +278,7 @@ sub ArchiveCleanup
     # If the archive failed, clean up
     #
     if ( !$stat{xferOK} ) {
-       #
-       # wait a short while and see if the system is still alive
-       #
        $stat{hostError} = $stat{lastOutputLine} if ( $stat{hostError} eq "" );
-       sleep(2);
        $stat{hostAbort} = 1;
        $ArchiveLOG->write(\"Archive failed: $stat{hostError}")
                                            if ( defined($ArchiveLOG) );
@@ -336,9 +338,9 @@ sub pidHandler
 #
 sub UserCommandRun
 {
-    my($type) = @_;
+    my($cmdType) = @_;
 
-    return if ( !defined($Conf{$type}) );
+    return if ( !defined($Conf{$cmdType}) );
     my $vars = {
         xfer         => $xfer,
         client       => $client,
@@ -358,10 +360,11 @@ sub UserCommandRun
         XferLOG      => $ArchiveLOG,
         stat         => \%stat,
         xferOK       => $stat{xferOK} || 0,
-       type         => $type,
+       type         => "archive",
+       cmdType      => $cmdType,
     };
-    my $cmd = $bpc->cmdVarSubstitute($Conf{$type}, $vars);
-    $ArchiveLOG->write(\"Executing $type: @$cmd\n");
+    my $cmd = $bpc->cmdVarSubstitute($Conf{$cmdType}, $vars);
+    $ArchiveLOG->write(\"Executing $cmdType: @$cmd\n");
     #
     # Run the user's command, dumping the stdout/stderr into the
     # Xfer log file.  Also supply the optional $vars and %Conf in