version 0.4.1

[matthijs/upstream/backupninja.git] / handlers / rdiff

diff --git a/handlers/rdiff b/handlers/rdiff
index 1f2058f47c4adf6d862a03b9e12140d13868dc33..90ca2a3ebf39f72e7d626c11d72ab28a3d48193c 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -6,7 +6,7 @@
 setsection source
 getconf type; sourcetype=$type
 getconf label
-getconf user; sourceuser=$user
+getconf user root; sourceuser=$user
 getconf keep
 getconf include
 getconf exclude
@@ -25,7 +25,7 @@ getconf host; desthost=$host
 [ "$desttype" == "remote" ] || fatal "Only remote destinations are supported"
 
 # see if we can login
-debug 0 "su $sourceuser -c \"ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'\""
+debug "su $sourceuser -c \"ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'\""
 if [ ! $test ]; then
        result=`su $sourceuser -c "ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'" 2>&1`
        if [ "$result" != "1" ]; then
@@ -34,7 +34,7 @@ if [ ! $test ]; then
 fi
 
 # see that rdiff-backup has the same version as here
-debug 0 "su $sourceuser -c \"ssh $desthost -l $destuser '$RDIFFBACKUP -V'\""
+debug "su $sourceuser -c \"ssh $desthost -l $destuser '$RDIFFBACKUP -V'\""
 if [ ! $test ]; then
        remoteversion=`su $sourceuser -c "ssh $desthost -l $destuser '$RDIFFBACKUP -V'" 2>&1`
        localversion=`$RDIFFBACKUP -V`
@@ -62,16 +62,16 @@ if [ "$keep" -gt "0" ]; then
        fi
        removestr="${removestr}${destdir}/${label}";
        
-       debug 0 "su $sourceuser -c '$removestr'"
+       debug "su $sourceuser -c '$removestr'"
        if [ ! $test ]; then
                output=`su $sourceuser -c "$removestr" 2>&1`
                code=$?
                if [ "$code" == "0" ]; then
-                       debug 0 $output
-                       debug 1 "Removing backups older than $keep days succeeded."
+                       debug $output
+                       info "Removing backups older than $keep days succeeded."
                else
-                       debug 2 $output
-                       debug 2 "Failed removing backups older than $keep."
+                       warning $output
+                       warning "Failed removing backups older than $keep."
                fi
        fi
 fi
@@ -100,16 +100,16 @@ execstr="${execstr}--exclude '/*' "
 # include client-part and server-part
 execstr="${execstr}$execstr_clientpart $execstr_serverpart"
 
-debug 0 "su $sourceuser -c '$execstr'"
+debug "su $sourceuser -c '$execstr'"
 if [ ! $test ]; then
        output=`su $sourceuser -c "$execstr" 2>&1`
        code=$?
        if [ "$code" == "0" ]; then
-               debug 0 $output
-               debug 1 "Successfully finished backing up source '$label'"
+               debug $output
+               info "Successfully finished backing up source '$label'"
        else
-               debug 2 $output
-               debug 2 "Failed backup up source '$label'"
+               warning $output
+               warning "Failed backup up source '$label'"
        fi
 fi