Merge branch 'master' into fix_options

dev/n_osync.sh

@@ -3,9 +3,10 @@
 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.1-rc1
+PROGRAM_VERSION=1.2.2-dev
 PROGRAM_BUILD=2017053002
-IS_STABLE=yes
+IS_STABLE=no
+
 
 ##### Execution order						#__WITH_PARANOIA_DEBUG
 #####	Function Name				Is parallel	#__WITH_PARANOIA_DEBUG
@@ -24,10 +25,11 @@ IS_STABLE=yes
 #	 	Sync				no		#__WITH_PARANOIA_DEBUG
 #			treeList		yes		#__WITH_PARANOIA_DEBUG
 #			treeList		yes		#__WITH_PARANOIA_DEBUG
+#			_getFileCtimeMtime	yes		#__WITH_PARANOIA_DEBUG
+#			_getFileCtimeMtime	yes		#__WITH_PARANOIA_DEBUG
 #			deleteList		yes		#__WITH_PARANOIA_DEBUG
 #			deleteList		yes		#__WITH_PARANOIA_DEBUG
 #			syncAttrs		no		#__WITH_PARANOIA_DEBUG
-#			_getFileCtimeMtime	yes		#__WITH_PARANOIA_DEBUG
 #			syncUpdate		no		#__WITH_PARANOIA_DEBUG
 #			syncUpdate		no		#__WITH_PARANOIA_DEBUG
 #			deletionPropagation	yes		#__WITH_PARANOIA_DEBUG
@@ -2055,17 +2057,18 @@ function Usage {
 	echo "or     osync.sh --initiator=/path/to/initiator/replica --target=ssh://[backupuser]@remotehost.com[:portnumber]//path/to/target/replica [OPTIONS] [QUICKSYNC OPTIONS]"
 	echo ""
 	echo "[OPTIONS]"
-	echo "--dry             Will run osync without actually doing anything; just testing"
-	echo "--no-prefix       Will suppress time / date suffix from output"
-	echo "--silent          Will run osync without any output to stdout, used for cron jobs"
-	echo "--errors-only     Output only errors (can be combined with silent or verbose)"
-	echo "--summary         Outputs a list of transferred / deleted files at the end of the run"
-	echo "--verbose         Increases output"
-	echo "--stats           Adds rsync transfer statistics to verbose output"
-	echo "--partial         Allows rsync to keep partial downloads that can be resumed later (experimental)"
-	echo "--no-maxtime      Disables any soft and hard execution time checks"
-	echo "--force-unlock    Will override any existing active or dead locks on initiator and target replica"
-	echo "--on-changes      Will launch a sync task after a short wait period if there is some file activity on initiator replica. You should try daemon mode instead"
+	echo "--dry                  Will run osync without actually doing anything; just testing"
+	echo "--no-prefix            Will suppress time / date suffix from output"
+	echo "--silent               Will run osync without any output to stdout, used for cron jobs"
+	echo "--errors-only          Output only errors (can be combined with silent or verbose)"
+	echo "--summary              Outputs a list of transferred / deleted files at the end of the run"
+	echo "--log-conflicts        Outputs a list of conflicted files"
+	echo "--verbose              Increases output"
+	echo "--stats                Adds rsync transfer statistics to verbose output"
+	echo "--partial              Allows rsync to keep partial downloads that can be resumed later (experimental)"
+	echo "--no-maxtime           Disables any soft and hard execution time checks"
+	echo "--force-unlock         Will override any existing active or dead locks on initiator and target replica"
+	echo "--on-changes           Will launch a sync task after a short wait period if there is some file activity on initiator replica. You should try daemon mode instead"
 	echo ""
 	echo "[QUICKSYNC OPTIONS]"
 	echo "--initiator=\"\"		Master replica path. Will contain state and backup directory (is mandatory)"
@@ -2254,6 +2257,10 @@ for i in "$@"; do
 		opts=$opts" --summary"
 		_SUMMARY=true
 		;;
+		--log-conflicts)
+		_LOG_CONFLICTS=true
+		opts=$opts" --log-conflicts"
+		;;
 		--no-prefix)
 		opts=$opts" --no-prefix"
 		_LOGGER_PREFIX=""

sync.conf.example

@@ -2,7 +2,7 @@
 
 ###### osync - Rsync based two way sync engine with fault tolerance
 ###### (C) 2013-2017 by Orsiris de Jong (www.netpower.fr)
-###### osync v1.1x / v1.2x config file rev 2017020801
+###### osync v1.1x / v1.2x config file rev 2017053001
 
 ## ---------- GENERAL OPTIONS
 
@@ -127,6 +127,8 @@ MAX_WAIT=7200
 
 ## ---------- BACKUP AND DELETION OPTIONS
 
+## Log a list of conflictual files
+LOG_CONFLICTS=yes
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
 ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.