Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2024-11-14 11:43:41 +01:00
Code Issues Releases Wiki Activity

Another quick fix comming from osync

Browse Source
This commit is contained in:
deajan 2015-08-25 15:41:00 +02:00
parent 2080da1565
commit c00a00525c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -22,8 +22,9 @@ UNDER WORK
CHANGELOG CHANGELOG
--------- ---------
- Backported some fixes from Osync - Backported some fixes from Osync
- Small improvments on install script - Small improvements on install script
- Copy ssh_filter.sh from osync project - Copy ssh_filter.sh from osync project
- Small improvements in obackup-batch.sh time management
- Quick and dirty hack to get the full last run log in SendAlert email - Quick and dirty hack to get the full last run log in SendAlert email
- Added detection of obackup.sh script in obackup-batch.sh to overcome mising path in crontab - Added detection of obackup.sh script in obackup-batch.sh to overcome mising path in crontab
- Moved command line arguments after config file load for allowing command line overrides - Moved command line arguments after config file load for allowing command line overrides

17
obackup-batch.sh
View File

@ -3,7 +3,7 @@
PROGRAM="Obackup-batch" # Batch program to run obackup instances sequentially and rerun failed ones PROGRAM="Obackup-batch" # Batch program to run obackup instances sequentially and rerun failed ones
AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_BUILD=2504201501 PROGRAM_BUILD=2508201501
## Runs an obackup instance for every conf file found ## Runs an obackup instance for every conf file found
## If an instance fails, run it again if time permits ## If an instance fails, run it again if time permits
@ -56,6 +56,13 @@ function CheckEnvironment
else else
OBACKUP_EXECUTABLE=$(type -p obackup.sh) OBACKUP_EXECUTABLE=$(type -p obackup.sh)
fi fi
## Check for CONF_FILE_PATH
if [ ! -d "$CONF_FILE_PATH" ]
then
Log "Cannot find conf file path $CONF_FILE_PATH"
Usage
fi
} }
function Batch function Batch
@ -72,7 +79,7 @@ function Batch
done done
RERUNS=0 RERUNS=0
while [ $MAX_EXECUTION_TIME -gt $SECONDS ] && [ "$RUN" != "" ] && [ $MAX_RERUNS -gt $RERUNS ] while ([ $MAX_EXECUTION_TIME -gt $SECONDS ] || [ $MAX_EXECUTION_TIME -eq 0 ]) && [ "$RUN" != "" ] && [ $MAX_RERUNS -gt $RERUNS ]
do do
Log "Obackup instances will be run for: $RUN" Log "Obackup instances will be run for: $RUN"
for i in $RUN for i in $RUN
@ -110,6 +117,7 @@ function Usage
echo "--path=/path/to/conf Path to obackup conf files, defaults to /etc/obackup" echo "--path=/path/to/conf Path to obackup conf files, defaults to /etc/obackup"
echo "--max-reruns=X Number of runs max for failed instances, (defaults to 3)" echo "--max-reruns=X Number of runs max for failed instances, (defaults to 3)"
echo "--max-exec-time=X Retry failed instances only if max execution time not reached (defaults to 36000 seconds)" echo "--max-exec-time=X Retry failed instances only if max execution time not reached (defaults to 36000 seconds)"
echo "--no-maxtime Run obackup without honoring conf file defined timeouts"
echo "--dry Will run obackup without actually doing anything; just testing" echo "--dry Will run obackup without actually doing anything; just testing"
echo "--silent Will run obackup without any output to stdout, used for cron jobs" echo "--silent Will run obackup without any output to stdout, used for cron jobs"
echo "--verbose Increases output" echo "--verbose Increases output"
@ -135,6 +143,9 @@ do
verbose=1 verbose=1
opts=$opts" --verbose" opts=$opts" --verbose"
;; ;;
--no-maxtime)
opts=$opts" --no-maxtime"
;;
--path=*) --path=*)
CONF_FILE_PATH=${i##*=} CONF_FILE_PATH=${i##*=}
;; ;;
@ -144,7 +155,7 @@ do
--max-exec-time=*) --max-exec-time=*)
MAX_EXECUTION_TIME=${i##*=} MAX_EXECUTION_TIME=${i##*=}
;; ;;
--help|-h) --help|-h|-?)
Usage Usage
;; ;;
*) *)