# B A C K U P N I N J A /()/
# `\|
#
-# Copyright (C) 2004 riseup.net -- property is theft.
+# Copyright (C) 2004-05 riseup.net -- property is theft.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
fi
if [ $print -lt $loglevel ]; then
- if [ -w "$logfile" ]; then
- colorize "$typestr$@" >> $logfile
- fi
+ logmsg "$typestr$@"
+ fi
+}
+
+function logmsg() {
+ if [ -w "$logfile" ]; then
+ echo -e `date "+%h %d %H:%M:%S"` "$@" >> $logfile
fi
}
# is not set to the current time.
getconf when "$defaultwhen"
if [ "$processnow" == 1 ]; then
- info "running $file because of --now"
+ info ">>>> starting action $file (because of --now)"
elif [ "$when" == "hourly" ]; then
- debug "running $file because 'when = hourly'"
+ info ">>>> starting action $file (because 'when = hourly')"
else
IFS=$'\t\n'
for w in $when; do
debug "skipping $file because it is not $w"
return
else
- info "running $file because it is $w"
+ info ">>>> starting action $file (because it is $w)"
fi
done
IFS=$' \t\n'
rm $bufferfile
if [ $_fatals != 0 ]; then
msg "*failed* -- $file"
- errormsg="$errormsg\n== failures from $file ==\n\n$ret\n"
+ errormsg="$errormsg\n== fatal errors from $file ==\n\n$ret\n"
+ passthru "Fatal: <<<< finished action $file: FAILED"
elif [ $_errors != 0 ]; then
msg "*error* -- $file"
errormsg="$errormsg\n== errors from $file ==\n\n$ret\n"
+ error "<<<< finished action $file: ERROR"
elif [ $_warnings != 0 ]; then
msg "*warning* -- $file"
errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n"
+ warning "<<<< finished action $file: WARNING"
else
msg "success -- $file"
-# elif [ $retcode == 0 ]; then
-# msg "success -- $file"
-# else
-# msg "unknown -- $file"
+ info "<<<< finished action $file: SUCCESS"
fi
let "fatals += _fatals"
getconf vservers no
getconf VSERVERINFO /usr/sbin/vserver-info
getconf VSERVER /usr/sbin/vserver
-getconf VROOTDIR `$VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'`
+getconf VROOTDIR `if [ -f "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'; fi`
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
exit 1
fi
-if [ "$VSERVERS" = "yes" -a ! -d $VROOTDIR ]; then
- echo "vservers option set in config, but $VROOTDIR is not a directory!"
+if [ "$vservers" == "yes" -a ! -d "$VROOTDIR" ]; then
+ echo "vservers option set in config, but $VROOTDIR is not a directory!"
fatal "vservers option set in config, but $VROOTDIR is not a directory!"
fi
check_perms $file
suffix="${file##*.}"
base=`basename $file`
- if [ "${base:0:1}" == "0" ]; then
+ if [ "${base:0:1}" == "0" -o "$suffix" == "disabled" ]; then
info "Skipping $file"
continue
fi
} | mail $reportemail -s "backupninja: $hostname $subject"
fi
+if [ $actions_run != 0 ]; then
+ info "FINISHED: $actions_run actions run. $fatals fatal. $errors error. $warnings warning."
+fi