Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-09-20 07:31:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed and improved the log file output

Browse Source
This commit is contained in:
Elijah Saxon 2005-06-30 22:05:33 +00:00
parent 0abb625ac2
commit 030f94dfdc
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backupninja
View File

@ -87,9 +87,13 @@ function printmsg() {
fi fi
if [ $print -lt $loglevel ]; then if [ $print -lt $loglevel ]; then
if [ -w "$logfile" ]; then logmsg "$typestr$@"
colorize "$typestr$@" >> $logfile fi
fi }
function logmsg() {
if [ -w "$logfile" ]; then
echo -e `date "+%h %d %H:%M:%S"` "$@" >> $logfile
fi fi
} }
@ -268,9 +272,9 @@ function process_action() {
# is not set to the current time. # is not set to the current time.
getconf when "$defaultwhen" getconf when "$defaultwhen"
if [ "$processnow" == 1 ]; then if [ "$processnow" == 1 ]; then
info "running $file because of --now" info ">>>> starting action $file (because of --now)"
elif [ "$when" == "hourly" ]; then elif [ "$when" == "hourly" ]; then
debug "running $file because 'when = hourly'" info ">>>> starting action $file (because 'when = hourly')"
else else
IFS=$'\t\n' IFS=$'\t\n'
for w in $when; do for w in $when; do
@ -282,7 +286,7 @@ function process_action() {
debug "skipping $file because it is not $w" debug "skipping $file because it is not $w"
return return
else else
info "running $file because it is $w" info ">>>> starting action $file (because it is $w)"
fi fi
done done
IFS=$' \t\n' IFS=$' \t\n'
@ -314,19 +318,18 @@ function process_action() {
rm $bufferfile rm $bufferfile
if [ $_fatals != 0 ]; then if [ $_fatals != 0 ]; then
msg "*failed* -- $file" msg "*failed* -- $file"
errormsg="$errormsg\n== failures from $file ==\n\n$ret\n" passthru "Fatal: <<<< finished action $file: FAILED"
elif [ $_errors != 0 ]; then elif [ $_errors != 0 ]; then
msg "*error* -- $file" msg "*error* -- $file"
errormsg="$errormsg\n== errors from $file ==\n\n$ret\n" errormsg="$errormsg\n== errors from $file ==\n\n$ret\n"
error "<<<< finished action $file: ERROR"
elif [ $_warnings != 0 ]; then elif [ $_warnings != 0 ]; then
msg "*warning* -- $file" msg "*warning* -- $file"
errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n" errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n"
warning "<<<< finished action $file: WARNING"
else else
msg "success -- $file" msg "success -- $file"
# elif [ $retcode == 0 ]; then info "<<<< finished action $file: SUCCESS"
# msg "success -- $file"
# else
# msg "unknown -- $file"
fi fi
let "fatals += _fatals" let "fatals += _fatals"
@ -511,3 +514,6 @@ if [ $doit == 1 ]; then
} | mail $reportemail -s "backupninja: $hostname $subject" } | mail $reportemail -s "backupninja: $hostname $subject"
fi fi
if [ $actions_run != 0 ]; then
info "FINISHED: $actions_run actions run. $fatals fatal. $errors error. $warnings warning."
fi