From 8fb9415609b3181d8522f42115508dd7a3643345 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 5 Jan 2010 13:39:32 +0100 Subject: 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 --- src/backupninja.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3