Module: check_mk
Branch: master
Commit: c4fb0ca6804178c7064e11163d5cc564f1668788
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4fb0ca6804178…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Jun 27 15:46:52 2018 +0200
6224 FIX Prevent multiple mkeventd's from being started in some situations
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.
Change-Id: I7f50835dbcb4b52f0ebf3b1fd0e81d886fa1b1fb
---
.werks/6224 | 16 ++++++++++++++++
omd/packages/check_mk/skel/etc/init.d/mkeventd | 3 ---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/.werks/6224 b/.werks/6224
new file mode 100644
index 0000000..927f217
--- /dev/null
+++ b/.werks/6224
@@ -0,0 +1,16 @@
+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 e84279c..6395e27 100755
--- a/omd/packages/check_mk/skel/etc/init.d/mkeventd
+++ b/omd/packages/check_mk/skel/etc/init.d/mkeventd
@@ -74,9 +74,6 @@ 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