Minor fixes

CHANGELOG.md

@@ -23,10 +23,12 @@ UNDER WORK
 - sync test automation
 - See if find command could use -delete instead of exec rm (must check compat for BSD and MacOS)
 - Partial download is still experimental and needs more testing.
+- Check the conflct backup and soft delete cleanup again
 
 RECENT CHANGES
 --------------
 
+- Prevent creation of a sync-id less log file when DEBUG is set
 - Added a sequential run batch script that can rerun failed batches
 - Fixed an issue where a failed task never gets resumed after a successfull file replication phase
 - Added experimental partial downloads support for rsync so big files can be resumed on slow links

README.md

@@ -74,6 +74,7 @@ If everything went well, you may run the actual configuration with one of the fo
 	$ ./osync.sh /path/to/your.conf --no-maxtime
 
 Verbose option will display which files and attrs are actually synchronized.
+You may mix "--silent" and "--verbose" parameters to output verbose input only in the log files.
 No-Maxtime option will disable execution time checks, which is usefull for big initial sync tasks that might take long time. Next runs should then only propagate changes and take much less time.
 
 Once you're confident about your fist runs, you may add osync as cron task like the following in /etc/crontab which would run osync every 5 minutes:

osync.sh

@@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=0.99RC4
-PROGRAM_BUILD=2711201401
+PROGRAM_BUILD=2811201401
 
 ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
 if ! type -p "$BASH" > /dev/null
@@ -1645,18 +1645,6 @@ function Init
                 trap 'TrapError ${LINENO} $?' ERR
         fi
 
-        if [ "$LOGFILE" == "" ]
-        then
-                if [ -w /var/log ]
-		then
-			LOG_FILE=/var/log/osync_$SYNC_ID.log
-		else
-			LOG_FILE=./osync_$SYNC_ID.log
-		fi
-        else
-                LOG_FILE="$LOGFILE"
-        fi
-
         MAIL_ALERT_MSG="Warning: Execution of osync instance $OSYNC_ID (pid $SCRIPT_PID) as $LOCAL_USER@$LOCAL_HOST produced errors on $(date)."
 
 	## Test if slave dir is a ssh uri, and if yes, break it down it its values
@@ -2091,8 +2079,6 @@ done
 # Remove leading space if there is one
 opts="${opts# *}"
 
-GetLocalOS
-InitLocalOSSettings
 CheckEnvironment
 if [ $? == 0 ]
 then
@@ -2115,6 +2101,21 @@ then
 		ConfigFile="$1"
 		LoadConfigFile "$ConfigFile"
 	fi
+
+        if [ "$LOGFILE" == "" ]
+        then
+                if [ -w /var/log ]
+		then
+			LOG_FILE=/var/log/osync_$SYNC_ID.log
+		else
+			LOG_FILE=./osync_$SYNC_ID.log
+		fi
+        else
+                LOG_FILE="$LOGFILE"
+        fi
+
+	GetLocalOS
+	InitLocalOSSettings
 	Init
 	GetRemoteOS
 	InitRemoteOSSettings