Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2025-02-05 19:03:50 +01:00
Code Issues Releases Wiki Activity

Improved some logging

Browse Source
This commit is contained in:
deajan 2015-08-26 00:40:23 +02:00
parent fb310b1026
commit b04891b6c7
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@ UNDER WORK
CHANGELOG CHANGELOG
--------- ---------
- Improved some logging
- Backported some fixes from Osync - Backported some fixes from Osync
- Small improvements on install script - Small improvements on install script
- Copy ssh_filter.sh from osync project - Copy ssh_filter.sh from osync project

18
obackup.sh
View File

@ -5,7 +5,7 @@
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=1.9pre PROGRAM_VERSION=1.9pre
PROGRAM_BUILD=2805201501 PROGRAM_BUILD=2015082601
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode ## 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 if ! type -p "$BASH" > /dev/null
@ -374,13 +374,13 @@ function GetRemoteOS
retval=$? retval=$?
if [ $retval != 0 ] if [ $retval != 0 ]
then then
eval "$SSH_CMD \"uname -v\" > $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1" eval "$SSH_CMD \"uname -v\" >> $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1"
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid 120 240 WaitForTaskCompletion $child_pid 120 240
retval=$? retval=$?
if [ $retval != 0 ] if [ $retval != 0 ]
then then
eval "$SSH_CMD \"uname\" > $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1" eval "$SSH_CMD \"uname\" >> $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1"
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid 120 240 WaitForTaskCompletion $child_pid 120 240
retval=$? retval=$?
@ -567,11 +567,21 @@ function CreateLocalStorageDirectories
if [ ! -d $LOCAL_SQL_STORAGE ] && [ "$BACKUP_SQL" != "no" ] if [ ! -d $LOCAL_SQL_STORAGE ] && [ "$BACKUP_SQL" != "no" ]
then then
mkdir -p $LOCAL_SQL_STORAGE mkdir -p $LOCAL_SQL_STORAGE
if [ $? != 0 ]
then
LogError "Cannot create directory $LOCAL_SQL_STORAGE"
return 1
fi
fi fi
if [ ! -d $LOCAL_FILE_STORAGE ] && [ "$BACKUP_FILES" != "no" ] if [ ! -d $LOCAL_FILE_STORAGE ] && [ "$BACKUP_FILES" != "no" ]
then then
mkdir -p $LOCAL_FILE_STORAGE mkdir -p $LOCAL_FILE_STORAGE
if [ $? != 0 ]
then
LogError "Cannot create directory $LOCAL_FILE_STORAGE"
return 1
fi
fi fi
} }
@ -586,6 +596,7 @@ function CheckSpaceRequirements
if [ $? != 0 ] if [ $? != 0 ]
then then
LOCAL_SQL_SPACE=0 LOCAL_SQL_SPACE=0
LogError "Command Output:\n$(cat $RUN_DIR/obackup_local_sql_storage_$SCRIPT_PID)"
else else
LOCAL_SQL_SPACE=$(cat $RUN_DIR/obackup_local_sql_storage_$SCRIPT_PID | tail -1 | awk '{print $4}') LOCAL_SQL_SPACE=$(cat $RUN_DIR/obackup_local_sql_storage_$SCRIPT_PID | tail -1 | awk '{print $4}')
LOCAL_SQL_DRIVE=$(cat $RUN_DIR/obackup_local_sql_storage_$SCRIPT_PID | tail -1 | awk '{print $1}') LOCAL_SQL_DRIVE=$(cat $RUN_DIR/obackup_local_sql_storage_$SCRIPT_PID | tail -1 | awk '{print $1}')
@ -614,6 +625,7 @@ function CheckSpaceRequirements
if [ $? != 0 ] if [ $? != 0 ]
then then
LOCAL_FILE_SPACE=0 LOCAL_FILE_SPACE=0
LogError "Command Output:\n$(cat $RUN_DIR/obackup_local_file_storage_$SCRIPT_PID)"
else else
LOCAL_FILE_SPACE=$(cat $RUN_DIR/obackup_local_file_storage_$SCRIPT_PID | tail -1 | awk '{print $4}') LOCAL_FILE_SPACE=$(cat $RUN_DIR/obackup_local_file_storage_$SCRIPT_PID | tail -1 | awk '{print $4}')
LOCAL_FILE_DRIVE=$(cat $RUN_DIR/obackup_local_file_storage_$SCRIPT_PID | tail -1 | awk '{print $1}') LOCAL_FILE_DRIVE=$(cat $RUN_DIR/obackup_local_file_storage_$SCRIPT_PID | tail -1 | awk '{print $1}')