From 1c9db7136fb1cb84b6a45d0968b57e9f3dcc9478 Mon Sep 17 00:00:00 2001 From: deajan Date: Sat, 29 Dec 2018 18:41:12 +0100 Subject: [PATCH] No conflictlist file will not trigger an error --- dev/n_osync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 7578e10..29a8199 100644 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -7,7 +7,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-pre-rc1 -PROGRAM_BUILD=2018122101 +PROGRAM_BUILD=2018122901 IS_STABLE=no ##### Execution order #__WITH_PARANOIA_DEBUG @@ -2432,7 +2432,7 @@ function LogConflicts { Logger "$(cat ${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__conflictListFile]})" "ALWAYS" ) else - Logger "No conflictList file." "ERROR" + Logger "No conflictList file." "NOTICE" fi if [ "$ALERT_CONFLICTS" == "yes" ] && [ -s "$RUN_DIR/$PROGRAM.conflictList.compare.$SCRIPT_PID.$TSTAMP" ]; then