Module: check_mk
Branch: master
Commit: b5ecd2f5d7e962c1568a7f557c98ed2b22939649
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5ecd2f5d7e962…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Jun 19 12:06:07 2017 +0200
4692 FIX Correctly handle deactivated event console when Nagios core is used.
This fix avoids log entries and exceptions of the form:
"[mkeventd at /omd/sites/stable/tmp/run/mkeventd/status] cannot connect: No such
file or directory"
Change-Id: I090fe902288fa47d64870237870ed55701032f8f
---
.werks/4692 | 13 +++++++++++++
livestatus/src/module.cc | 8 ++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/.werks/4692 b/.werks/4692
new file mode 100644
index 0000000..19d0080
--- /dev/null
+++ b/.werks/4692
@@ -0,0 +1,13 @@
+Title: Correctly handle deactivated event console when Nagios core is used.
+Level: 1
+Component: livestatus
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1497866624
+
+This fix avoids log entries and exceptions of the form:
+
+ "[mkeventd at /omd/sites/stable/tmp/run/mkeventd/status] cannot connect: No such
file or directory"
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index 2e1f030..c01095f 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -642,8 +642,12 @@ public:
return comments_for_object(toImpl(service)->host_ptr, toImpl(service));
}
- // TODO(sp) Do we need a separate NEB argument for this?
- bool mkeventdEnabled() override { return true; }
+ bool mkeventdEnabled() override {
+ if (const char *config_mkeventd = getenv("CONFIG_MKEVENTD")) {
+ return config_mkeventd == string("on");
+ }
+ return false;
+ }
string mkeventdSocketPath() override { return fl_mkeventd_socket_path; }
string mkLogwatchPath() override { return fl_mk_logwatch_path; }