BackupPC_ovz: control of debug output

[ovzbpc.git] / BackupPC_ovz

diff --git a/BackupPC_ovz b/BackupPC_ovz
index bc7228d0603c07697908721cea5fa792bae32243..2cbc86ca889b79990262893b1e9b41c8d6c37789 100755 (executable)
--- a/BackupPC_ovz
+++ b/BackupPC_ovz
@@ -24,10 +24,13 @@ my $snapsize = '25g';
 my $hnlistFile = "/etc/backuppc/".basename($0).".hnlist";
 my $velistFile = $ENV{HOME}."/log/".basename($0).".velist";
 
-# Uncomment one of the following
+# Write to the debug file only if it is already present
+my $dbgfn = "/tmp/BackupPC_ovz.debug";
 my $dbgf;
-open $dbgf, ">>/tmp/BackupPC_ovz.debug" || die "Cannot open debug file";
-#open $dbgf, ">>/dev/null" || die "Cannot open debug file";
+if ( ! -f $dbgfn) {
+  $dbgfn = "/dev/null";
+}
+open $dbgf, ">>$dbgfn" || die "Cannot open debug file $dbgfn";
 
 sub mydie($)
 {
@@ -47,7 +50,8 @@ sub cmdExecOrEval
     print(STDERR "Perl code fragment for exec shouldn't return!!\n");
     exit(1);
   } else {
-  $cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
+    $cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
+    print $dbgf ": execing command $cmd\n";
     alarm(0);
     $cmd = [map { m/(.*)/ } @$cmd];    # untaint
     #
@@ -68,8 +72,10 @@ sub cmdSystemOrEval
   $? = 0;
   $cmd = join(" ", $cmd) if ( ref($cmd) eq "ARRAY" );
   if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) {
+    print $dbgf ": evaluating command $cmd\n";
     eval($cmd);
   } else {
+    print $dbgf ": running command $cmd\n";
     system($cmd);
   }
 }