WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added --log-conflicts option

This commit is contained in:
deajan 2017-05-30 09:29:16 +02:00
parent 0b442e2bcf
commit 908c9af888
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dev/n_osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2017 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2.2-dev PROGRAM_VERSION=1.2.2-dev
PROGRAM_BUILD=2017053010 PROGRAM_BUILD=2017053001
IS_STABLE=no IS_STABLE=no
##### Execution order #__WITH_PARANOIA_DEBUG ##### Execution order #__WITH_PARANOIA_DEBUG
@ -2056,17 +2056,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 "or osync.sh --initiator=/path/to/initiator/replica --target=ssh://[backupuser]@remotehost.com[:portnumber]//path/to/target/replica [OPTIONS] [QUICKSYNC OPTIONS]"
echo "" echo ""
echo "[OPTIONS]" echo "[OPTIONS]"
echo "--dry Will run osync without actually doing anything; just testing" echo "--dry Will run osync without actually doing anything; just testing"
echo "--no-prefix Will suppress time / date suffix from output" 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 "--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 "--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 "--summary Outputs a list of transferred / deleted files at the end of the run"
echo "--verbose Increases output" echo "--log-conflicts Outputs a list of conflicted files"
echo "--stats Adds rsync transfer statistics to verbose output" echo "--verbose Increases output"
echo "--partial Allows rsync to keep partial downloads that can be resumed later (experimental)" echo "--stats Adds rsync transfer statistics to verbose output"
echo "--no-maxtime Disables any soft and hard execution time checks" echo "--partial Allows rsync to keep partial downloads that can be resumed later (experimental)"
echo "--force-unlock Will override any existing active or dead locks on initiator and target replica" echo "--no-maxtime Disables any soft and hard execution time checks"
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 "--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 ""
echo "[QUICKSYNC OPTIONS]" echo "[QUICKSYNC OPTIONS]"
echo "--initiator=\"\" Master replica path. Will contain state and backup directory (is mandatory)" echo "--initiator=\"\" Master replica path. Will contain state and backup directory (is mandatory)"
@ -2248,11 +2249,15 @@ for i in "$@"; do
_NOLOCKS=true _NOLOCKS=true
;; ;;
--errors-only) --errors-only)
_LOGGER_ERR_ONLY=true LOGGER_ERR_ONLY="yes"
;; ;;
--summary) --summary)
_SUMMARY=true _SUMMARY=true
;; ;;
--log-conflicts)
_LOG_CONFLICTS=true
opts=$opts" --log-conflicts"
;;
--no-prefix) --no-prefix)
_LOGGER_PREFIX="" _LOGGER_PREFIX=""
;; ;;

4
sync.conf.example
View File

@ -2,7 +2,7 @@
###### osync - Rsync based two way sync engine with fault tolerance ###### osync - Rsync based two way sync engine with fault tolerance
###### (C) 2013-2017 by Orsiris de Jong (www.netpower.fr) ###### (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 ## ---------- GENERAL OPTIONS
@ -127,6 +127,8 @@ MAX_WAIT=7200
## ---------- BACKUP AND DELETION OPTIONS ## ---------- 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 ## 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 CONFLICT_BACKUP=yes
## Keep multiple backup versions of the same file. Warning, This can be very space consuming. ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.