Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reduced log level for 3rdparty pings

This commit is contained in:
deajan 2016-03-10 10:26:26 +01:00
parent 0f11faa7c7
commit 69fc7ac9cd
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/debug_obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2016030302 PROGRAM_BUILD=2016030302
IS_STABLE=no IS_STABLE=no
## FUNC_BUILD=2016030401 ## FUNC_BUILD=2016031001
## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@ -154,6 +154,7 @@ function KillChilds {
if [ "$self" == true ]; then if [ "$self" == true ]; then
kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &) kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &)
fi fi
# sleep 30 needs to wait before killing itself
} }
function SendAlert { function SendAlert {
@ -162,6 +163,10 @@ function SendAlert {
local mail_no_attachment= local mail_no_attachment=
local attachment_command= local attachment_command=
if [ "$DESTINATION_MAILS" == "" ]; then
return 0
fi
if [ "$_DEBUG" == "yes" ]; then if [ "$_DEBUG" == "yes" ]; then
Logger "Debug mode, no warning email will be sent." "NOTICE" Logger "Debug mode, no warning email will be sent." "NOTICE"
return 0 return 0
@ -556,7 +561,7 @@ function WaitForCompletion {
SendAlert SendAlert
fi fi
if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then
Logger "Max hard execution time exceeded for script. Stopping current task execution." "ERROR" Logger "Max hard execution time exceeded for script in [$caller_name]. Stopping current task execution." "ERROR"
kill -s SIGTERM $pid kill -s SIGTERM $pid
if [ $? == 0 ]; then if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" Logger "Task stopped succesfully" "NOTICE"
@ -698,14 +703,14 @@ function CheckConnectivity3rdPartyHosts {
eval "$PING_CMD $i > /dev/null 2>&1" & eval "$PING_CMD $i > /dev/null 2>&1" &
WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]} WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]}
if [ $? != 0 ]; then if [ $? != 0 ]; then
Logger "Cannot ping 3rd party host $i" "WARN" Logger "Cannot ping 3rd party host $i" "NOTICE"
else else
remote_3rd_party_success=1 remote_3rd_party_success=1
fi fi
done done
IFS=$OLD_IFS IFS=$OLD_IFS
if [ $remote_3rd_party_success -ne 1 ]; then if [ $remote_3rd_party_success -ne 1 ]; then
Logger "No remote 3rd party host responded to ping. No internet ?" "CRITICAL" Logger "No remote 3rd party host responded to ping. No internet ?" "ERROR"
return 1 return 1
fi fi
fi fi

13
dev/ofunctions.sh
View File

@ -1,4 +1,4 @@
## FUNC_BUILD=2016030401 ## FUNC_BUILD=2016031001
## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@ -144,6 +144,7 @@ function KillChilds {
if [ "$self" == true ]; then if [ "$self" == true ]; then
kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &) kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &)
fi fi
# sleep 30 needs to wait before killing itself
} }
function SendAlert { function SendAlert {
@ -152,6 +153,10 @@ function SendAlert {
local mail_no_attachment= local mail_no_attachment=
local attachment_command= local attachment_command=
if [ "$DESTINATION_MAILS" == "" ]; then
return 0
fi
if [ "$_DEBUG" == "yes" ]; then if [ "$_DEBUG" == "yes" ]; then
Logger "Debug mode, no warning email will be sent." "NOTICE" Logger "Debug mode, no warning email will be sent." "NOTICE"
return 0 return 0
@ -546,7 +551,7 @@ function WaitForCompletion {
SendAlert SendAlert
fi fi
if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then
Logger "Max hard execution time exceeded for script. Stopping current task execution." "ERROR" Logger "Max hard execution time exceeded for script in [$caller_name]. Stopping current task execution." "ERROR"
kill -s SIGTERM $pid kill -s SIGTERM $pid
if [ $? == 0 ]; then if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" Logger "Task stopped succesfully" "NOTICE"
@ -688,14 +693,14 @@ function CheckConnectivity3rdPartyHosts {
eval "$PING_CMD $i > /dev/null 2>&1" & eval "$PING_CMD $i > /dev/null 2>&1" &
WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]} WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]}
if [ $? != 0 ]; then if [ $? != 0 ]; then
Logger "Cannot ping 3rd party host $i" "WARN" Logger "Cannot ping 3rd party host $i" "NOTICE"
else else
remote_3rd_party_success=1 remote_3rd_party_success=1
fi fi
done done
IFS=$OLD_IFS IFS=$OLD_IFS
if [ $remote_3rd_party_success -ne 1 ]; then if [ $remote_3rd_party_success -ne 1 ]; then
Logger "No remote 3rd party host responded to ping. No internet ?" "CRITICAL" Logger "No remote 3rd party host responded to ping. No internet ?" "ERROR"
return 1 return 1
fi fi
fi fi

13
obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2016030302 PROGRAM_BUILD=2016030302
IS_STABLE=no IS_STABLE=no
## FUNC_BUILD=2016030401 ## FUNC_BUILD=2016031001
## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@ -144,6 +144,7 @@ function KillChilds {
if [ "$self" == true ]; then if [ "$self" == true ]; then
kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &) kill -s SIGTERM "$pid" || (sleep 30 && kill -9 "$pid" &)
fi fi
# sleep 30 needs to wait before killing itself
} }
function SendAlert { function SendAlert {
@ -151,6 +152,10 @@ function SendAlert {
local mail_no_attachment= local mail_no_attachment=
local attachment_command= local attachment_command=
if [ "$DESTINATION_MAILS" == "" ]; then
return 0
fi
if [ "$_DEBUG" == "yes" ]; then if [ "$_DEBUG" == "yes" ]; then
Logger "Debug mode, no warning email will be sent." "NOTICE" Logger "Debug mode, no warning email will be sent." "NOTICE"
return 0 return 0
@ -536,7 +541,7 @@ function WaitForCompletion {
SendAlert SendAlert
fi fi
if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then if [ $SECONDS -gt $hard_max_time ] && [ $hard_max_time != 0 ]; then
Logger "Max hard execution time exceeded for script. Stopping current task execution." "ERROR" Logger "Max hard execution time exceeded for script in [$caller_name]. Stopping current task execution." "ERROR"
kill -s SIGTERM $pid kill -s SIGTERM $pid
if [ $? == 0 ]; then if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" Logger "Task stopped succesfully" "NOTICE"
@ -671,14 +676,14 @@ function CheckConnectivity3rdPartyHosts {
eval "$PING_CMD $i > /dev/null 2>&1" & eval "$PING_CMD $i > /dev/null 2>&1" &
WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]} WaitForTaskCompletion $! 360 360 ${FUNCNAME[0]}
if [ $? != 0 ]; then if [ $? != 0 ]; then
Logger "Cannot ping 3rd party host $i" "WARN" Logger "Cannot ping 3rd party host $i" "NOTICE"
else else
remote_3rd_party_success=1 remote_3rd_party_success=1
fi fi
done done
IFS=$OLD_IFS IFS=$OLD_IFS
if [ $remote_3rd_party_success -ne 1 ]; then if [ $remote_3rd_party_success -ne 1 ]; then
Logger "No remote 3rd party host responded to ping. No internet ?" "CRITICAL" Logger "No remote 3rd party host responded to ping. No internet ?" "ERROR"
return 1 return 1
fi fi
fi fi