tagged 0.4.4

[matthijs/upstream/backupninja.git] / backupninja

diff --git a/backupninja b/backupninja
index e9587a3c58b6b9c410035376fc1e0d12cd699abd..b7d4a149e2e73683745e92f224faf899abd1c71f 100755 (executable)
--- a/backupninja
+++ b/backupninja
@@ -27,22 +27,24 @@ function setupcolors() {
        RED="\033[31;01m"
        OFF="\033[0m"
        CYAN="\033[36;01m"
+       COLORS=($BLUE $GREEN $YELLOW $RED $PURPLE)
 }
 
-#function run() {
-#      RUNERROR=0
-#      debug 0 "$@"
-#      returnstring=`$@ 2>&1`
-#      RUNERROR=$?
-#      RUNERRORS=$[RUNERRORS+RUNERROR]
-#      if [ "$RUNERROR" != 0 ]; then
-#              debug 3 "Exitcode $RUNERROR returned when running: $@"
-#              debug 3 "$returnstring"
-#      else
-#              debug 0 "$returnstring"
-#      fi
-#      return $RUNERROR
-#}
+function colorize() {
+       if [ "$usecolors" == "yes" ]; then
+               local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
+               [ "$typestr" == "Debug" ] && type=0
+               [ "$typestr" == "Info" ] && type=1
+               [ "$typestr" == "Warning" ] && type=2
+               [ "$typestr" == "Error" ] && type=3
+               [ "$typestr" == "Fatal" ] && type=4
+               color=${COLORS[$type]}
+               endcolor=$OFF
+               echo -e "$color$@$endcolor"
+       else
+               echo -e "$@"
+       fi
+}
 
 # We have the following message levels:
 # 0 - debug - blue
@@ -56,38 +58,44 @@ function setupcolors() {
 # used to capture output from handlers
 echo_debug_msg=0
 
-usecolor=yes
+usecolors=yes
 
 function printmsg() {
        [ ${#@} -gt 1 ] || return
-        
-       types=(Debug Info Warning Error Fatal)
+
        type=$1
-       print=$[4-type]
-       typestr=${types[$type]}
-       if [ "$usecolor" == "yes" ]; then
-               colors=($BLUE $GREEN $YELLOW $RED $PURPLE)
-               color=${colors[$type]}
-               endcolor=$OFF
-       fi
-       
        shift
-       
-       if [ "$echo_debug_msg" != "0" -a "$type" -gt "1" ]; then
-               echo -e "$typestr: $@"
+       if [ $type == 100 ]; then
+               typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
+               [ "$typestr" == "Debug" ] && type=0
+               [ "$typestr" == "Info" ] && type=1
+               [ "$typestr" == "Warning" ] && type=2
+               [ "$typestr" == "Error" ] && type=3
+               [ "$typestr" == "Fatal" ] && type=4
+               typestr=""
+       else
+               types=(Debug Info Warning Error Fatal)
+               typestr="${types[$type]}: "
        fi
        
-       if [ "$debug" == 1 ]; then
-               echo -e "${color}$typestr: $@${endcolor}" >&2
+       print=$[4-type]
+       
+       if [ $echo_debug_msg == 1 ]; then
+               echo -e "$typestr$@" >&2
+       elif [ $debug ]; then
+               colorize "$typestr$@" >&2
        fi
        
        if [ $print -lt $loglevel ]; then
                if [ -w "$logfile" ]; then
-                       echo -e "${color}$typestr: $@${endcolor}" >> $logfile
+                       colorize "$typestr$@" >> $logfile
                fi
        fi
 }
 
+function passthru() {
+       printmsg 100 "$@"
+}
 function debug() {
        printmsg 0 "$@"
 }
@@ -230,6 +238,7 @@ The following options are available:
 -t, --test           Run in test mode, no actions are actually taken.
 -n, --now            Perform actions now, instead of when they
                      might be scheduled.
+    --run FILE       Execute the specified action file and then exit.    
 When using colored output, there are:
 EOF
        debug=1
@@ -276,16 +285,29 @@ function process_action() {
        fi
        
        let "actions_run += 1"
-       echo_debug_msg=1
 
        # call the handler:
-       ret=`( . $scriptdir/$suffix $file )`
-       retcode="$?"
-
-       _warnings=`echo $ret | grep "Warning: " | wc -l`
-       _errors=`echo $ret | grep "Error: " | wc -l`
-       _fatals=`echo $ret | grep "Fatal: " | wc -l`
-
+       local bufferfile="/tmp/backupninja.buffer.$$"
+       echo "" > $bufferfile
+       echo_debug_msg=1
+       (
+               . $scriptdir/$suffix $file
+       ) 2>&1 | (
+               while read a; do
+                       echo $a >> $bufferfile
+                       [ $debug ] && colorize "$a"
+               done
+       )
+       retcode=$?
+       # ^^^^^^^^ we have a problem! we can't grab the return code "$?". grrr.
+       echo_debug_msg=0
+
+       _warnings=`cat $bufferfile | grep "^Warning: " | wc -l`
+       _errors=`cat $bufferfile | grep "^Error: " | wc -l`
+       _fatals=`cat $bufferfile | grep "^Fatal: " | wc -l`
+       
+       ret=`grep "\(^Warning: \|^Error: \|^Fatal: \)" $bufferfile`
+       rm $bufferfile
        if [ $_fatals != 0 ]; then
                msg "*failed* -- $file"
                errormsg="$errormsg\n== failures from $file ==\n\n$ret\n"
@@ -295,16 +317,17 @@ function process_action() {
        elif [ $_warnings != 0 ]; then
                msg "*warning* -- $file"
                errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n"
-       elif [ $retcode == 0 ]; then
-               msg "success -- $file"
        else
-               msg "unknown -- $file"
+               msg "success -- $file"
+#      elif [ $retcode == 0 ]; then
+#              msg "success -- $file"
+#      else
+#              msg "unknown -- $file"
        fi
 
-       echo_debug_msg=0        
        let "fatals += _fatals"
        let "errors += _errors"
-       let "warnings += _warnings"
+       let "warnings += _warnings"     
 }
 
 #####################################################
@@ -332,14 +355,31 @@ while [ $# -ge 1 ]; do
                        # we shift here to avoid processing the file path 
                        shift
                        ;;
+               --run)
+                       debug=1
+                       if [ -f $2 ]; then
+                               singlerun=$2
+                               processnow=1
+                       else
+                               fatal "--run option must be fallowed by a backupninja action file"
+                               usage
+                       fi
+                       shift
+                       ;;
                *)
+                       debug=1
                        fatal "Unknown option $1"
                        usage
+                       exit
                        ;;
        esac
        shift
 done                                                                                                                                                                                                           
 
+#if [ $debug ]; then
+#      usercolors=yes
+#fi
+
 ## Load and confirm basic configuration values
 
 # bootstrap
@@ -365,6 +405,7 @@ getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
 getconf MYSQLDUMP /usr/bin/mysqldump
 getconf GZIP /bin/gzip
+getconf RSYNC /usr/bin/rsync
 
 [ -d "$configdirectory" ] || fatal "Configuration directory '$configdirectory' not found."
 
@@ -385,8 +426,14 @@ warnings=0
 actions_run=0
 errormsg=""
 
-for file in $configdirectory/*; do
-       [ -f $file ] || continue;
+if [ "$singlerun" ]; then
+       files=$singlerun
+else
+       files=`find $configdirectory -mindepth 1 `
+fi
+
+for file in $files; do
+       [ -f "$file" ] || continue
 
        check_perms $file
        suffix="${file##*.}"