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

Rebuilt targets

This commit is contained in:
deajan 2016-08-08 00:23:48 +02:00
parent 6fb84d1441
commit dbeb79980f
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dev/debug_obackup.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#TODO: rework IFS= statements #TODO: rework old IFS= statements
###### Remote push/pull (or local) backup script for files & databases ###### Remote push/pull (or local) backup script for files & databases
@ -8,12 +8,12 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-dev PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016080701 PROGRAM_BUILD=2016080703
IS_STABLE=yes IS_STABLE=yes
#### MINIMAL-FUNCTION-SET BEGIN #### #### MINIMAL-FUNCTION-SET BEGIN ####
## FUNC_BUILD=2016080701 ## FUNC_BUILD=2016080702
## 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
#TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode #TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode
@ -585,7 +585,7 @@ function WaitForTaskCompletion {
local counting="{6:-true}" # Count time since function launch if true, script launch if false local counting="{6:-true}" # Count time since function launch if true, script launch if false
Logger "${FUNCNAME[0]} called by [$caller_name]." "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG Logger "${FUNCNAME[0]} called by [$caller_name]." "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG
__CheckArguments 5 $# ${FUNCNAME[0]} "$@" #__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 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 log_ttime=0 # local time instance for comparaison
@ -2210,11 +2210,11 @@ function FilesBackup {
# Backup non recursive directories # Backup non recursive directories
#for BACKUP_TASK in $FILE_BACKUP_TASKS #for BACKUP_TASK in $FILE_BACKUP_TASKS
#do #do
Logger "Beginning file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2225,11 +2225,11 @@ function FilesBackup {
## Backup files at root of DIRECTORIES_RECURSE_LIST directories ## Backup files at root of DIRECTORIES_RECURSE_LIST directories
#for BACKUP_TASK in $RECURSIVE_DIRECTORY_LIST #for BACKUP_TASK in $RECURSIVE_DIRECTORY_LIST
#do #do
Logger "Beginning non recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning non recursive file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "no-recurse" Duplicity "$backupTask" "no-recurse"
else else
Rsync "$BACKUP_TASK" "no-recurse" Rsync "$backupTask" "no-recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2240,11 +2240,11 @@ function FilesBackup {
# Backup sub directories of recursive directories # Backup sub directories of recursive directories
#for BACKUP_TASK in $FILE_RECURSIVE_BACKUP_TASKS #for BACKUP_TASK in $FILE_RECURSIVE_BACKUP_TASKS
#do #do
Logger "Beginning recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning recursive file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2256,11 +2256,11 @@ function CheckTotalExecutionTime {
#### Check if max execution time of whole script as been reached #### Check if max execution time of whole script as been reached
if [ $SECONDS -gt $SOFT_MAX_EXEC_TIME_TOTAL ]; then if [ $SECONDS -gt $SOFT_MAX_EXEC_TIME_TOTAL ]; then
Logger "Max soft execution time of the whole backup exceeded while backing up [$BACKUP_TASK]." "ERROR" Logger "Max soft execution time of the whole backup exceeded." "ERROR"
WARN_ALERT=1 WARN_ALERT=1
SendAlert SendAlert
if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ] && [ $HARD_MAX_EXEC_TIME_TOTAL -ne 0 ]; then if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ] && [ $HARD_MAX_EXEC_TIME_TOTAL -ne 0 ]; then
Logger "Max hard execution time of the whole backup exceeded while backing up [$BACKUP_TASK], stopping backup process." "CRITICAL" Logger "Max hard execution time of the whole backup exceeded, stopping backup process." "CRITICAL"
exit 1 exit 1
fi fi
fi fi

28
obackup.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#TODO: rework IFS= statements #TODO: rework old IFS= statements
###### Remote push/pull (or local) backup script for files & databases ###### Remote push/pull (or local) backup script for files & databases
@ -8,12 +8,12 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-dev PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016080701 PROGRAM_BUILD=2016080703
IS_STABLE=yes IS_STABLE=yes
#### MINIMAL-FUNCTION-SET BEGIN #### #### MINIMAL-FUNCTION-SET BEGIN ####
## FUNC_BUILD=2016080701 ## FUNC_BUILD=2016080702
## 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
#TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode #TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode
@ -2110,11 +2110,11 @@ function FilesBackup {
# Backup non recursive directories # Backup non recursive directories
#for BACKUP_TASK in $FILE_BACKUP_TASKS #for BACKUP_TASK in $FILE_BACKUP_TASKS
#do #do
Logger "Beginning file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2125,11 +2125,11 @@ function FilesBackup {
## Backup files at root of DIRECTORIES_RECURSE_LIST directories ## Backup files at root of DIRECTORIES_RECURSE_LIST directories
#for BACKUP_TASK in $RECURSIVE_DIRECTORY_LIST #for BACKUP_TASK in $RECURSIVE_DIRECTORY_LIST
#do #do
Logger "Beginning non recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning non recursive file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "no-recurse" Duplicity "$backupTask" "no-recurse"
else else
Rsync "$BACKUP_TASK" "no-recurse" Rsync "$backupTask" "no-recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2140,11 +2140,11 @@ function FilesBackup {
# Backup sub directories of recursive directories # Backup sub directories of recursive directories
#for BACKUP_TASK in $FILE_RECURSIVE_BACKUP_TASKS #for BACKUP_TASK in $FILE_RECURSIVE_BACKUP_TASKS
#do #do
Logger "Beginning recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning recursive file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -2155,11 +2155,11 @@ function CheckTotalExecutionTime {
#### Check if max execution time of whole script as been reached #### Check if max execution time of whole script as been reached
if [ $SECONDS -gt $SOFT_MAX_EXEC_TIME_TOTAL ]; then if [ $SECONDS -gt $SOFT_MAX_EXEC_TIME_TOTAL ]; then
Logger "Max soft execution time of the whole backup exceeded while backing up [$BACKUP_TASK]." "ERROR" Logger "Max soft execution time of the whole backup exceeded." "ERROR"
WARN_ALERT=1 WARN_ALERT=1
SendAlert SendAlert
if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ] && [ $HARD_MAX_EXEC_TIME_TOTAL -ne 0 ]; then if [ $SECONDS -gt $HARD_MAX_EXEC_TIME_TOTAL ] && [ $HARD_MAX_EXEC_TIME_TOTAL -ne 0 ]; then
Logger "Max hard execution time of the whole backup exceeded while backing up [$BACKUP_TASK], stopping backup process." "CRITICAL" Logger "Max hard execution time of the whole backup exceeded, stopping backup process." "CRITICAL"
exit 1 exit 1
fi fi
fi fi