WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed checking remote pings regarless of mode

This commit is contained in:
deajan 2016-11-13 15:59:12 +01:00
parent 6f7a87b2de
commit 4869e3e89a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/n_osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2-beta2 PROGRAM_VERSION=1.2-beta2
PROGRAM_BUILD=2016111002 PROGRAM_BUILD=2016111301
IS_STABLE=no IS_STABLE=no
# Execution order #__WITH_PARANOIA_DEBUG # Execution order #__WITH_PARANOIA_DEBUG
@ -1254,8 +1254,6 @@ function Sync {
local targetFail local targetFail
Logger "Starting synchronization task." "NOTICE" Logger "Starting synchronization task." "NOTICE"
CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost
if [ "$RESUME_SYNC" != "no" ]; then if [ "$RESUME_SYNC" != "no" ]; then
if [ -f "${INITIATOR[$__resumeCount]}" ]; then if [ -f "${INITIATOR[$__resumeCount]}" ]; then
@ -1735,6 +1733,8 @@ function Init {
# remove everything before first '/' # remove everything before first '/'
TARGET_SYNC_DIR=${hosturiandpath#*/} TARGET_SYNC_DIR=${hosturiandpath#*/}
else
REMOTE_OPERATION="no"
fi fi
if [ "$INITIATOR_SYNC_DIR" == "" ] || [ "$TARGET_SYNC_DIR" == "" ]; then if [ "$INITIATOR_SYNC_DIR" == "" ] || [ "$TARGET_SYNC_DIR" == "" ]; then
@ -2089,7 +2089,6 @@ opts="${opts# *}"
fi fi
MIN_WAIT=30 MIN_WAIT=30
REMOTE_OPERATION=no
else else
ConfigFile="${1}" ConfigFile="${1}"
LoadConfigFile "$ConfigFile" LoadConfigFile "$ConfigFile"