Module: check_mk
Branch: master
Commit: 5cc0fcfe53bf4fb82965fa3173f900f7006e80f0
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc0fcfe53bf4f…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Jul 19 13:33:59 2017 +0200
Refactoring: Inline _set_logger methods
Each of them had only a single call site and consisted of at most 2 lines.
Furthermore, one of those 2 lines will die soon. See:
https://refactoring.com/catalog/inlineMethod.html
Change-Id: I6448cb7efea3804c647d33208054d78ba2a1f130
---
bin/mkeventd | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/bin/mkeventd b/bin/mkeventd
index 17a0aeb..5461c50 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -394,10 +394,7 @@ class VerboseLock(object):
def __init__(self, name):
self._depth = 0
self._name = name
- self._set_logger()
-
- def _set_logger(self):
- self.logger = logger.getChild("VerboseLock(%s)" % self._name)
+ self.logger = logger.getChild("VerboseLock(%s)" % name)
def __enter__(self):
self._depth += 1
@@ -596,13 +593,8 @@ def check_timeperiod(tpname):
class HostConfig(object):
def __init__(self):
- self._set_logger()
- self.initialize()
-
-
- def _set_logger(self):
self.logger = logger.getChild("HostConfig")
-
#self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.HostConfig"])
+ self.initialize()
def initialize(self):
@@ -1259,7 +1251,8 @@ class EventServer(object):
self._syslog_tcp = None
self._snmptrap = None
self._mib_resolver = None
- self._set_logger()
+ self.logger = logger.getChild("EventServer")
+
self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventServer"])
self.create_pipe()
self.open_eventsocket()
@@ -1275,11 +1268,6 @@ class EventServer(object):
self.host_config = HostConfig()
- def _set_logger(self):
- self.logger = logger.getChild("EventServer")
-
self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventServer"])
-
-
def status_columns(self):
columns = self._general_columns()
columns += g_perfcounters.status_columns()
@@ -3092,13 +3080,9 @@ class StatusServer(object):
self._tcp_socket = None
self._reopen_sockets = False
self._should_terminate = False
- self._set_logger()
- self.open_sockets()
-
-
- def _set_logger(self):
self.logger = logger.getChild("StatusServer")
self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.StatusServer"])
+ self.open_sockets()
def open_sockets(self):
@@ -3652,13 +3636,9 @@ def run_eventd():
class EventStatus(object):
def __init__(self):
- self._set_logger()
- self.flush()
-
-
- def _set_logger(self):
self.logger = logger.getChild("EventStatus")
self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventStatus"])
+ self.flush()
def flush(self):