From ef3153cbcd6d3cfe6e3ece20c64d6bc992e05778 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 22 Aug 2016 10:29:56 +0200 Subject: [PATCH] Fixed RunAfterHook double execution --- CHANGELOG.md | 1 + dev/n_osync.sh | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0d22d9..9fd87df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ RECENT CHANGES -------------- XX xxx 2016: osync v1.1.2 released +- Fixed RunAfterHook may be executed twice - Fixed soft deletion when SUDO_EXEC is enabled 06 Aug 2016: osync v1.1.1 released diff --git a/dev/n_osync.sh b/dev/n_osync.sh index cf1dd52..fa1610a 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1.2 -PROGRAM_BUILD=20160801301 +PROGRAM_BUILD=20160802201 IS_STABLE=yes source "./ofunctions.sh" @@ -60,9 +60,7 @@ function TrapQuit { exitcode=240 # Special exit code for daemon mode not stopping on warnings else UnlockReplicas - if [ "$RUN_AFTER_CMD_ON_ERROR" == "yes" ]; then - RunAfterHook - fi + RunAfterHook CleanUp Logger "$PROGRAM finished." "NOTICE" exitcode=0 @@ -1777,5 +1775,4 @@ opts="${opts# *}" if [ $? == 0 ]; then SoftDelete fi - RunAfterHook fi