aboutsummaryrefslogtreecommitdiff
path: root/src/backupninja.in
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-01-05 13:39:32 +0100
committerintrigeri <intrigeri@boum.org>2010-01-05 13:39:32 +0100
commit8fb9415609b3181d8522f42115508dd7a3643345 (patch)
tree5674eb8ced0286cecf39e33d9595664bdc7b7107 /src/backupninja.in
parent00e759430a1812bd5a2ca8dc5cc8e5046330c10b (diff)
downloadbackupninja-8fb9415609b3181d8522f42115508dd7a3643345.tar.gz
backupninja-8fb9415609b3181d8522f42115508dd7a3643345.tar.bz2
Adding optional report of infos sent by handlers in the email (closes #563734)
Cherry-picked and re-indented patch 76792c8f45afa1fdaeb81c2af77499ca0b83ce64 from Olivier Berger. Conflicts: src/backupninja.in
Diffstat (limited to 'src/backupninja.in')
-rwxr-xr-xsrc/backupninja.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backupninja.in b/src/backupninja.in
index a991f58..f871e0c 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -335,8 +335,9 @@ function process_action() {
_errors=`cat $bufferfile | grep "^Error: " | wc -l`
_fatals=`cat $bufferfile | grep "^Fatal: " | wc -l`
_halts=`cat $bufferfile | grep "^Halt: " | wc -l`
+ _infos=`cat $bufferfile | grep "^Info: " | wc -l`
- ret=`grep "\(^Warning: \|^Error: \|^Fatal: \|Halt: \)" $bufferfile`
+ ret=`grep "\(^Info: \|^Warning: \|^Error: \|^Fatal: \|Halt: \)" $bufferfile`
rm $bufferfile
if [ $_halts != 0 ]; then
msg "*halt* -- $file"
@@ -356,6 +357,9 @@ function process_action() {
warning "<<<< finished action $file: WARNING"
else
msg "success -- $file"
+ if [ $_infos != 0 -a "$reportinfo" == "yes" ]; then
+ errormsg="$errormsg\n== infos from $file ==\n\n$ret\n"
+ fi
info "<<<< finished action $file: SUCCESS"
fi
@@ -456,6 +460,7 @@ getconf reportemail
getconf reporthost
getconf reportspace
getconf reportsuccess yes
+getconf reportinfo no
getconf reportuser
getconf reportwarning yes
getconf loglevel 3