Module: check_mk
Branch: master
Commit: 2a7ae2d03ac61a84795c3edaaaafce4d19135a9a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a7ae2d03ac61a…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Apr 5 09:44:28 2018 +0200
An initializer should, well, *initialize* things...
Change-Id: I61fb9fb4e27259e10bf299fd8481464dfa1db2a0
---
cmk/ec/main.py | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/cmk/ec/main.py b/cmk/ec/main.py
index 80c4486..d057906 100644
--- a/cmk/ec/main.py
+++ b/cmk/ec/main.py
@@ -1269,7 +1269,6 @@ class EventServer(ECServerThread):
self._perfcounters = perfcounters
self._event_status = event_status
- def open_sockets(self):
self.create_pipe()
self.open_eventsocket()
self.open_syslog()
@@ -3515,13 +3514,12 @@ class StatusServer(ECServerThread):
self._perfcounters = perfcounters
self._event_status = event_status
- def table(self, name):
- return getattr(self, "table_%s" % name)
-
- def open_sockets(self):
self.open_unix_socket()
self.open_tcp_socket()
+ def table(self, name):
+ return getattr(self, "table_%s" % name)
+
def open_unix_socket(self):
path = self.settings.paths.unix_socket.value
if path.exists():
@@ -5046,9 +5044,7 @@ def main():
perfcounters = Perfcounters()
event_status = EventStatus(settings, perfcounters)
g_status_server = StatusServer(settings, perfcounters, event_status)
- g_status_server.open_sockets()
g_event_server = EventServer(settings, perfcounters, event_status)
- g_event_server.open_sockets()
event_status.load_status()