projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed and improved the log file output
[matthijs/upstream/backupninja.git]
/
backupninja
diff --git
a/backupninja
b/backupninja
index 687571bf88e092bcda470163a0ef9875e00883e9..6b888cb006e85609f04bbc2a369184510aaec687 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-3,7
+3,7
@@
# B A C K U P N I N J A /()/
# `\|
#
# 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
#
# 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
@@
-87,9
+87,13
@@
function printmsg() {
fi
if [ $print -lt $loglevel ]; then
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
}
fi
}
@@
-268,9
+272,9
@@
function process_action() {
# is not set to the current time.
getconf when "$defaultwhen"
if [ "$processnow" == 1 ]; then
# 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
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
else
IFS=$'\t\n'
for w in $when; do
@@
-282,7
+286,7
@@
function process_action() {
debug "skipping $file because it is not $w"
return
else
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'
fi
done
IFS=$' \t\n'
@@
-314,19
+318,18
@@
function process_action() {
rm $bufferfile
if [ $_fatals != 0 ]; then
msg "*failed* -- $file"
rm $bufferfile
if [ $_fatals != 0 ]; then
msg "*failed* -- $file"
-
errormsg="$errormsg\n== failures 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"
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"
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"
else
msg "success -- $file"
-# elif [ $retcode == 0 ]; then
-# msg "success -- $file"
-# else
-# msg "unknown -- $file"
+ info "<<<< finished action $file: SUCCESS"
fi
let "fatals += _fatals"
fi
let "fatals += _fatals"
@@
-426,6
+429,10
@@
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
getconf MYSQLDUMP /usr/bin/mysqldump
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
getconf MYSQLDUMP /usr/bin/mysqldump
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
+getconf vservers no
+getconf VSERVERINFO /usr/sbin/vserver-info
+getconf VSERVER /usr/sbin/vserver
+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."
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
@@
-439,6
+446,11
@@
if [ "$UID" != "0" ]; then
exit 1
fi
exit 1
fi
+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
+
## Process each configuration file
# by default, don't make files which are world or group readable.
## Process each configuration file
# by default, don't make files which are world or group readable.
@@
-502,3
+514,6
@@
if [ $doit == 1 ]; then
} | mail $reportemail -s "backupninja: $hostname $subject"
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