|
|
|
@ -9,7 +9,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
|
|
|
|
|
AUTHOR="(C) 2013-2018 by Orsiris de Jong"
|
|
|
|
|
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
|
|
|
|
PROGRAM_VERSION=1.3.0-beta1
|
|
|
|
|
PROGRAM_BUILD=2018101302
|
|
|
|
|
PROGRAM_BUILD=2018101401
|
|
|
|
|
IS_STABLE=no
|
|
|
|
|
|
|
|
|
|
##### Execution order #__WITH_PARANOIA_DEBUG
|
|
|
|
@ -1848,7 +1848,7 @@ function Sync {
|
|
|
|
|
## Step 4
|
|
|
|
|
if [ "$resumeInitiator" == "${SYNC_ACTION[4]}" ] || [ "$resumeTarget" == "${SYNC_ACTION[4]}" ]; then
|
|
|
|
|
if [[ "$RSYNC_ATTR_ARGS" == *"-X"* ]] || [[ "$RSYNC_ATTR_ARGS" == *"-A"* ]]; then
|
|
|
|
|
syncAttrs "${INITIATOR[$__replicaDir]}" "$TARGET_SYNC_DIR" &
|
|
|
|
|
syncAttrs "${INITIATOR[$__replicaDir]}" "${TARGET[$__replicaDir]}" &
|
|
|
|
|
ExecTasks $! "${FUNCNAME[0]}-step4" false 0 0 $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME false $SLEEP_TIME $KEEP_LOGGING
|
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
|
echo "${SYNC_ACTION[4]}" > "${INITIATOR[$__initiatorLastActionFile]}"
|
|
|
|
@ -2408,9 +2408,9 @@ function LogConflicts {
|
|
|
|
|
Logger "File conflicts: INITIATOR << >> TARGET" "ALWAYS"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
|
|
|
|
|
_LOGGER_PREFIX=""
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
if [ -f "$RUN_DIR/$PROGRAM.conflictList.compare.$SCRIPT_PID.$TSTAMP" ]; then
|
|
|
|
|
echo "" > "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__conflictListFile]}"
|
|
|
|
|
while read -r line; do
|
|
|
|
|