Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-23 03:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding optional report of infos sent by handlers in the email (closes #563734)

Browse Source 
Cherry-picked and re-indented patch 76792c8f45afa1fdaeb81c2af77499ca0b83ce64
from Olivier Berger.

Conflicts:

	src/backupninja.in
This commit is contained in:
intrigeri 2010-01-05 13:39:32 +01:00
parent 00e759430a
commit 8fb9415609
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -30,4 +30,4 @@ Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature
dan@garthwaite.org -- reportspace bugfix
Tuomas Jormola <tj@solitudo.net> -- "when = manual" option
Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix
Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix
Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo option

2
ChangeLog
View File

@ -5,6 +5,8 @@ version 0.9.7 -- UNRELEASED
. add 'when = manual' option, that can be used in the global config
file or in a given backup action file. Thanks Tuomas Jormola for the
preliminary patch (Closes: #511299)
. new reportinfo option: when set, messages sent by handlers with
"info" are included in the report e-mail (closes #563734)
lib changes
easydialog:
. Allow form fields input to grow up to 100 chars (Closes: #562249)

4
etc/backupninja.conf.in
View File

@ -21,6 +21,10 @@ reportemail = root
# even if all modules reported success. (default = yes)
reportsuccess = yes
# if set to 'yes', info messages from handlers will be
# sent into the email (default = no)
reportinfo = no
# if set to 'yes', a report email will be generated
# even if there was no error. (default = yes)
reportwarning = yes

7
src/backupninja.in
View File

@ -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