Rebuilt targets
This commit is contained in:
		
							parent
							
								
									71a0437de6
								
							
						
					
					
						commit
						9833ce9032
					
				|  | @ -8,7 +8,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance | |||
| AUTHOR="(C) 2013-2017 by Orsiris de Jong" | ||||
| CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" | ||||
| PROGRAM_VERSION=1.2.2-dev | ||||
| PROGRAM_BUILD=2017081401 | ||||
| PROGRAM_BUILD=2017112201 | ||||
| IS_STABLE=no | ||||
| 
 | ||||
| 
 | ||||
|  | @ -2480,7 +2480,7 @@ function _HandleLocksLocal { | |||
| 	local lockfileContent | ||||
| 	local lockPid | ||||
| 	local lockInstanceID | ||||
| 	local writeLocks | ||||
| 	local writeLocks=false | ||||
| 
 | ||||
| 	if [ ! -d "$replicaStateDir" ]; then | ||||
| 		mkdir -p "$replicaStateDir" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$replicaType.$SCRIPT_PID.$TSTAMP" 2>&1 | ||||
|  | @ -2706,6 +2706,8 @@ function RemoteLogger { | |||
| } | ||||
| 
 | ||||
| function _HandleLocksRemoteSub { | ||||
| 	local writeLocks=false | ||||
| 
 | ||||
| 	if [ ! -d "$replicaStateDir" ]; then | ||||
| 		mkdir -p "$replicaStateDir" | ||||
| 		retval=$? | ||||
|  | @ -2812,6 +2814,7 @@ function HandleLocks { | |||
| 			_HandleLocksRemote "${TARGET[$__replicaDir]}${TARGET[$__stateDir]}" "${TARGET[$__lockFile]}" "${TARGET[$__type]}" $overwrite & | ||||
| 			pids="$pids;$!" | ||||
| 		fi | ||||
| 		#Assume locks could be created unless pid returns with exit code | ||||
| 		INITIATOR_LOCK_FILE_EXISTS=true | ||||
| 		TARGET_LOCK_FILE_EXISTS=true | ||||
| 		WaitForTaskCompletion $pids 720 1800 $SLEEP_TIME $KEEP_LOGGING true true false | ||||
|  |  | |||
							
								
								
									
										7
									
								
								osync.sh
								
								
								
								
							
							
						
						
									
										7
									
								
								osync.sh
								
								
								
								
							|  | @ -8,7 +8,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance | |||
| AUTHOR="(C) 2013-2017 by Orsiris de Jong" | ||||
| CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" | ||||
| PROGRAM_VERSION=1.2.2-dev | ||||
| PROGRAM_BUILD=2017081401 | ||||
| PROGRAM_BUILD=2017112201 | ||||
| IS_STABLE=no | ||||
| 
 | ||||
| 
 | ||||
|  | @ -2306,7 +2306,7 @@ function _HandleLocksLocal { | |||
| 	local lockfileContent | ||||
| 	local lockPid | ||||
| 	local lockInstanceID | ||||
| 	local writeLocks | ||||
| 	local writeLocks=false | ||||
| 
 | ||||
| 	if [ ! -d "$replicaStateDir" ]; then | ||||
| 		mkdir -p "$replicaStateDir" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$replicaType.$SCRIPT_PID.$TSTAMP" 2>&1 | ||||
|  | @ -2522,6 +2522,8 @@ function RemoteLogger { | |||
| } | ||||
| 
 | ||||
| function _HandleLocksRemoteSub { | ||||
| 	local writeLocks=false | ||||
| 
 | ||||
| 	if [ ! -d "$replicaStateDir" ]; then | ||||
| 		mkdir -p "$replicaStateDir" | ||||
| 		retval=$? | ||||
|  | @ -2627,6 +2629,7 @@ function HandleLocks { | |||
| 			_HandleLocksRemote "${TARGET[$__replicaDir]}${TARGET[$__stateDir]}" "${TARGET[$__lockFile]}" "${TARGET[$__type]}" $overwrite & | ||||
| 			pids="$pids;$!" | ||||
| 		fi | ||||
| 		#Assume locks could be created unless pid returns with exit code | ||||
| 		INITIATOR_LOCK_FILE_EXISTS=true | ||||
| 		TARGET_LOCK_FILE_EXISTS=true | ||||
| 		WaitForTaskCompletion $pids 720 1800 $SLEEP_TIME $KEEP_LOGGING true true false | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue