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

Quick semantic update for soft stop

This commit is contained in:
deajan 2016-12-03 09:53:44 +01:00
parent a7e41410e9
commit 52e7921b53
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev/n_osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 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-beta3 PROGRAM_VERSION=1.2-beta3
PROGRAM_BUILD=2016120103 PROGRAM_BUILD=2016120301
IS_STABLE=no IS_STABLE=no
# Execution order #__WITH_PARANOIA_DEBUG # Execution order #__WITH_PARANOIA_DEBUG
@ -49,17 +49,18 @@ _LOGGER_PREFIX="time"
## Working directory. This directory exists in any replica and contains state files, backups, soft deleted files etc ## Working directory. This directory exists in any replica and contains state files, backups, soft deleted files etc
OSYNC_DIR=".osync_workdir" OSYNC_DIR=".osync_workdir"
# The catch CRTL+C behavior can be changed at script entry point with SOFT_STOP=0
function TrapStop { function TrapStop {
if [ $SOFT_STOP -eq 0 ]; then if [ $SOFT_STOP -eq 2 ]; then
Logger " /!\ WARNING: Manual exit of osync is really not recommended. Sync will be in inconsistent state." "WARN" Logger " /!\ WARNING: Manual exit of osync is really not recommended. Sync will be in inconsistent state." "WARN"
Logger " /!\ WARNING: If you are sure, please hit CTRL+C another time to quit." "WARN" Logger " /!\ WARNING: If you are sure, please hit CTRL+C another time to quit." "WARN"
SOFT_STOP=1 SOFT_STOP=1
return 1 return 1
fi fi
if [ $SOFT_STOP -eq 1 ]; then if [ $SOFT_STOP -lt 2 ]; then
Logger " /!\ WARNING: CTRL+C hit twice. Exiting osync. Please wait while replicas get unlocked..." "WARN" Logger " /!\ WARNING: CTRL+C hit. Exiting osync. Please wait while replicas get unlocked..." "WARN"
SOFT_STOP=2 SOFT_STOP=0
exit 2 exit 2
fi fi
} }
@ -135,6 +136,7 @@ function CheckEnvironment {
fi fi
} }
# Only gets checked in config file mode where all values should be present
function CheckCurrentConfig { function CheckCurrentConfig {
__CheckArguments 0 $# "${FUNCNAME[0]}" "$@" #__WITH_PARANOIA_DEBUG __CheckArguments 0 $# "${FUNCNAME[0]}" "$@" #__WITH_PARANOIA_DEBUG
@ -153,6 +155,7 @@ function CheckCurrentConfig {
done done
} }
# Gets checked in quicksync and config file mode
function CheckCurrentConfigAll { function CheckCurrentConfigAll {
__CheckArguments 0 $# "${FUNCNAME[0]}" "$@" #__WITH_PARANOIA_DEBUG __CheckArguments 0 $# "${FUNCNAME[0]}" "$@" #__WITH_PARANOIA_DEBUG
@ -2138,6 +2141,8 @@ function SyncOnChanges {
} }
#### SCRIPT ENTRY POINT
# quicksync mode settings, overriden by config file # quicksync mode settings, overriden by config file
STATS=false STATS=false
PARTIAL=no PARTIAL=no
@ -2152,8 +2157,8 @@ no_maxtime=false
opts="" opts=""
ERROR_ALERT=false ERROR_ALERT=false
WARN_ALERT=false WARN_ALERT=false
# Number of CTRL+C # Number of CTRL+C needed to stop script
SOFT_STOP=0 SOFT_STOP=2
# Number of given replicas in command line # Number of given replicas in command line
_QUICK_SYNC=0 _QUICK_SYNC=0
sync_on_changes=false sync_on_changes=false