Module: check_mk
Branch: master
Commit: c453ff96ec081cdd367f772eeede4a32a2a43ae2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c453ff96ec081c…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Thu Dec 20 16:37:41 2018 +0100
EC: Inline _shal_terminate method
Change-Id: I5e6c95bac6f0c131d418775fd141768a1f59b82e
---
cmk/ec/main.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/cmk/ec/main.py b/cmk/ec/main.py
index 0542d05..ab92c89 100644
--- a/cmk/ec/main.py
+++ b/cmk/ec/main.py
@@ -225,7 +225,7 @@ class ECServerThread(threading.Thread):
def run(self):
self._logger.info("Starting up")
- while not self._shal_terminate():
+ while not self._terminate_event.is_set():
try:
with cmk.utils.profile.Profile(
enabled=self._profiling_enabled,
profile_file=str(self._profile_file)):
@@ -238,9 +238,6 @@ class ECServerThread(threading.Thread):
self._logger.info("Terminated")
- def _shal_terminate(self):
- return self._terminate_event.is_set()
-
def terminate(self):
self._terminate_event.set()
@@ -938,7 +935,7 @@ class EventServer(ECServerThread):
# fd to (fileobject, data)
client_sockets = {}
select_timeout = 1
- while not self._shal_terminate():
+ while not self._terminate_event.is_set():
try:
readable = select.select(listen_list + client_sockets.keys(), [], [],
select_timeout)[0]
@@ -2978,7 +2975,7 @@ class StatusServer(ECServerThread):
self._reopen_sockets = True
def serve(self):
- while not self._shal_terminate():
+ while not self._terminate_event.is_set():
try:
client_socket = None
addr_info = None