|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
#### MINIMAL-FUNCTION-SET BEGIN ####
|
|
|
|
|
|
|
|
|
|
## FUNC_BUILD=2016082201
|
|
|
|
|
## FUNC_BUILD=2016082202
|
|
|
|
|
## 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
|
|
|
|
@ -580,7 +580,6 @@ function WaitForTaskCompletion {
|
|
|
|
|
Logger "${FUNCNAME[0]} called by [$caller_name]." "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG
|
|
|
|
|
__CheckArguments 6 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG
|
|
|
|
|
|
|
|
|
|
local soft_alert=0 # Does a soft alert need to be triggered, if yes, send an alert once
|
|
|
|
|
local log_ttime=0 # local time instance for comparaison
|
|
|
|
|
|
|
|
|
|
local seconds_begin=$SECONDS # Seconds since the beginning of the script
|
|
|
|
@ -620,7 +619,6 @@ function WaitForTaskCompletion {
|
|
|
|
|
if [ $exec_time -gt $soft_max_time ]; then
|
|
|
|
|
if [ $soft_alert -eq 0 ] && [ $soft_max_time -ne 0 ]; then
|
|
|
|
|
Logger "Max soft execution time exceeded for task [$caller_name] with pids [$(joinString , ${pidsArray[@]})]." "WARN"
|
|
|
|
|
soft_alert=1
|
|
|
|
|
SendAlert
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|