Module: check_mk
Branch: master
Commit: 44a0bc70b859f2eb5e4e255d56b73efee37af5fe
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44a0bc70b859f2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 4 09:41:35 2017 +0200
EC: EventServer open sockets not during constructor call
Change-Id: I42753a4fcd7326905c86971b35446ad47c081baa
---
bin/mkeventd | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/bin/mkeventd b/bin/mkeventd
index 57f26ae..86cba42 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -1240,12 +1240,6 @@ class EventServer(ECServerThread):
self._snmptrap = None
self._mib_resolver = None
- self.create_pipe()
- self.open_eventsocket()
- self.open_syslog()
- self.open_syslog_tcp()
- self.open_snmptrap()
-
self._rules = []
self._hash_stats = []
for _unused_facility in xrange(32):
@@ -1254,6 +1248,14 @@ class EventServer(ECServerThread):
self.host_config = HostConfig()
+ def open_sockets(self):
+ self.create_pipe()
+ self.open_eventsocket()
+ self.open_syslog()
+ self.open_syslog_tcp()
+ self.open_snmptrap()
+
+
@classmethod
def status_columns(cls):
columns = cls._general_columns()
@@ -5126,6 +5128,7 @@ if __name__ == "__main__":
g_status_server = StatusServer()
g_status_server.open_sockets()
g_event_server = EventServer()
+ g_event_server.open_sockets()
g_event_status.load_status()