From d6e543f1d61bbe1993862975d039bbf02cc12505 Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 6 Apr 2016 20:32:10 +0200 Subject: [PATCH] Logging begins before remote connections --- dev/debug_osync.sh | 16 +++++++++------- dev/n_osync.sh | 12 +++++++----- osync.sh | 16 +++++++++------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 363e03e..64f8b31 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1-pre PROGRAM_BUILD=2016040603 IS_STABLE=yes -## FUNC_BUILD=2016040601 +## FUNC_BUILD=2016040602 ## 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 @@ -731,7 +731,7 @@ function CheckConnectivityRemoteHost { eval "$PING_CMD $REMOTE_HOST > /dev/null 2>&1" & WaitForTaskCompletion $! 180 180 ${FUNCNAME[0]} if [ $? != 0 ]; then - Logger "Cannot ping $REMOTE_HOST" "CRITICAL" + Logger "Cannot ping $REMOTE_HOST" "ERROR" return 1 fi fi @@ -2789,17 +2789,19 @@ opts="${opts# *}" if [ $_QUICK_SYNC -lt 2 ]; then CheckCurrentConfig fi + + DATE=$(date) + Logger "-------------------------------------------------------------" "NOTICE" + Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" + Logger "-------------------------------------------------------------" "NOTICE" + Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" + GetRemoteOS InitRemoteOSSettings if [ $sync_on_changes -eq 1 ]; then SyncOnChanges else - DATE=$(date) - Logger "-------------------------------------------------------------" "NOTICE" - Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" - Logger "-------------------------------------------------------------" "NOTICE" - Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" if [ $no_maxtime -eq 1 ]; then SOFT_MAX_EXEC_TIME=0 HARD_MAX_EXEC_TIME=0 diff --git a/dev/n_osync.sh b/dev/n_osync.sh index aa37f1c..735d9db 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -1740,17 +1740,19 @@ opts="${opts# *}" if [ $_QUICK_SYNC -lt 2 ]; then CheckCurrentConfig fi + + DATE=$(date) + Logger "-------------------------------------------------------------" "NOTICE" + Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" + Logger "-------------------------------------------------------------" "NOTICE" + Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" + GetRemoteOS InitRemoteOSSettings if [ $sync_on_changes -eq 1 ]; then SyncOnChanges else - DATE=$(date) - Logger "-------------------------------------------------------------" "NOTICE" - Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" - Logger "-------------------------------------------------------------" "NOTICE" - Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" if [ $no_maxtime -eq 1 ]; then SOFT_MAX_EXEC_TIME=0 HARD_MAX_EXEC_TIME=0 diff --git a/osync.sh b/osync.sh index f3a531b..a8495d3 100755 --- a/osync.sh +++ b/osync.sh @@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1-pre PROGRAM_BUILD=2016040603 IS_STABLE=yes -## FUNC_BUILD=2016040601 +## FUNC_BUILD=2016040602 ## 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 @@ -705,7 +705,7 @@ function CheckConnectivityRemoteHost { eval "$PING_CMD $REMOTE_HOST > /dev/null 2>&1" & WaitForTaskCompletion $! 180 180 ${FUNCNAME[0]} if [ $? != 0 ]; then - Logger "Cannot ping $REMOTE_HOST" "CRITICAL" + Logger "Cannot ping $REMOTE_HOST" "ERROR" return 1 fi fi @@ -2680,17 +2680,19 @@ opts="${opts# *}" if [ $_QUICK_SYNC -lt 2 ]; then CheckCurrentConfig fi + + DATE=$(date) + Logger "-------------------------------------------------------------" "NOTICE" + Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" + Logger "-------------------------------------------------------------" "NOTICE" + Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" + GetRemoteOS InitRemoteOSSettings if [ $sync_on_changes -eq 1 ]; then SyncOnChanges else - DATE=$(date) - Logger "-------------------------------------------------------------" "NOTICE" - Logger "$DRY_WARNING $DATE - $PROGRAM $PROGRAM_VERSION script begin." "NOTICE" - Logger "-------------------------------------------------------------" "NOTICE" - Logger "Sync task [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE" if [ $no_maxtime -eq 1 ]; then SOFT_MAX_EXEC_TIME=0 HARD_MAX_EXEC_TIME=0