mirror of
https://github.com/deajan/obackup.git
synced 2024-11-12 19:03:42 +01:00
Fixed nomaxtime not honored
This commit is contained in:
parent
1e13d259cb
commit
00cefd010e
@ -21,6 +21,7 @@ UNDER WORK
|
||||
|
||||
CHANGELOG
|
||||
---------
|
||||
- Fixed no_maxtime not honored
|
||||
- Improved some logging, also added highlighting to stdout errors
|
||||
- Backported some fixes from Osync
|
||||
- Small improvements on install script
|
||||
|
11
obackup.sh
11
obackup.sh
@ -5,7 +5,7 @@
|
||||
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
|
||||
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
|
||||
PROGRAM_VERSION=1.9pre
|
||||
PROGRAM_BUILD=2015082601
|
||||
PROGRAM_BUILD=2015090601
|
||||
|
||||
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
|
||||
if ! type -p "$BASH" > /dev/null
|
||||
@ -674,7 +674,7 @@ function CheckTotalExecutionTime
|
||||
LogError "Max soft execution time of the whole backup exceeded while backing up $BACKUP_TASK."
|
||||
soft_alert_total=1
|
||||
fi
|
||||
if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ]
|
||||
if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ] && [ $HARD_MAX_EXEC_TIME_TOTAL -ne 0 ]
|
||||
then
|
||||
LogError "Max hard execution time of the whole backup exceeded while backing up $BACKUP_TASK, stopping backup process."
|
||||
exit 1
|
||||
@ -1574,8 +1574,11 @@ then
|
||||
|
||||
if [ $no_maxtime -eq 1 ]
|
||||
then
|
||||
SOFT_MAX_EXEC_TIME=0
|
||||
HARD_MAX_EXEC_TIME=0
|
||||
SOFT_MAX_EXEC_TIME_DB_TASK=0
|
||||
SOFT_MAX_EXEC_TIME_FILE_TASK=0
|
||||
HARD_MAX_EXEC_TIME_DB_TASK=0
|
||||
HARD_MAX_EXEC_TIME_FILE_TASK=0
|
||||
HARD_MAX_EXEC_TIME_TOTAL=0
|
||||
fi
|
||||
OLD_IFS=$IFS
|
||||
RunBeforeHook
|
||||
|
Loading…
Reference in New Issue
Block a user