[checkmk-commits] Revert "6224 FIX Prevent multiple mkeventd' s from being started in some situations"

Module: check_mk Branch: master Commit: 5d4651827f780f89e022f34a59d76f05b1788ff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d4651827f780f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 2 14:19:27 2018 +0200 Revert "6224 FIX Prevent multiple mkeventd's from being started in some situations" This reverts commit c4fb0ca6804178c7064e11163d5cc564f1668788. There is more to this issue, and the init script is likely innocent --- .werks/6224 | 16 ---------------- omd/packages/check_mk/skel/etc/init.d/mkeventd | 3 +++ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.werks/6224 b/.werks/6224 deleted file mode 100644 index 927f217..0000000 --- a/.werks/6224 +++ /dev/null @@ -1,16 +0,0 @@ -Title: Prevent multiple mkeventd's from being started in some situations -Level: 1 -Component: ec -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.6.0i1 -Date: 1530107013 - -In rare circumstances, a non-responsive mkeventd process would stick -around after an OMD restart, and the new one would not be aware of -the other one's existance due to duplicated cleanup of the PID file -in the Event Console's init script and the process itself respectively. - -We remove the cleanup in the init script, as it is more coarse. diff --git a/omd/packages/check_mk/skel/etc/init.d/mkeventd b/omd/packages/check_mk/skel/etc/init.d/mkeventd index 6395e27..e84279c 100755 --- a/omd/packages/check_mk/skel/etc/init.d/mkeventd +++ b/omd/packages/check_mk/skel/etc/init.d/mkeventd @@ -74,6 +74,9 @@ case "$1" in exit 1 fi done + else + # Remove the stale pidfile to have a clean state after this + rm $PIDFILE fi echo 'OK' fi