From f1655018d2185ff8082389943c95f909e4f83aa6 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@holm.tech>
Date: Thu, 14 Mar 2019 10:30:52 +0100
Subject: [PATCH] Fix: CheckThread logger names
---
Script/cs/Threads/CheckThread.py | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/Script/cs/Threads/CheckThread.py b/Script/cs/Threads/CheckThread.py
index f6c0507..b1b16db 100644
--- a/Script/cs/Threads/CheckThread.py
+++ b/Script/cs/Threads/CheckThread.py
@@ -24,7 +24,7 @@ class CheckThread(threading.Thread):
self.delete = delete
##### Main logger #####
- self.logger = logging.getLogger('main')
+ self.mainLogger = logging.getLogger('main')
self.main_ERS_handler = ers.LoggingHandler()
##### Get configuration parameters #####
@@ -48,23 +48,23 @@ class CheckThread(threading.Thread):
##### Set Logger Level #####
set_log_level(self.LogLevel, self.CheckLog)
- self.check_logger = logging.getLogger('CheckThread')
- self.check_logger.addHandler(self.CheckLog)
+ self.logger = logging.getLogger('CheckThread')
+ self.logger.addHandler(self.CheckLog)
##### Add ERS handler #####
if self.ERSenabled:
try:
self.check_ERS_handler=ers.LoggingHandler()
set_log_level(self.ERSLogLevel,self.check_ERS_handler)
- self.check_logger.addHandler( self.check_ERS_handler )
+ self.logger.addHandler( self.check_ERS_handler )
except Exception,ex:
- self.check_logger.error("CheckThread could not create ERS, reason is '%s'", str(ex))
+ self.logger.error("CheckThread could not create ERS, reason is '%s'", str(ex))
# end def __init__()
def run(self):
- self.logger.info(thread_id_string())
+ self.mainLogger.info(thread_id_string())
while True:
@@ -76,14 +76,14 @@ class CheckThread(threading.Thread):
##### Check for a new partition #####
if self.IPCPartition(self.partition).isValid() and not self.partition_connected:
self.event.wait(self.ERSTimeout)
- self.check_logger.warning('Found partition %s, adding ERS', self.partition)
+ self.logger.warning('Found partition %s, adding ERS', self.partition)
self.partition_connected = True
##### Add ERS handlers to all loggers #####
self.change_state_ers(True)
##### Check for the disappearance of partition #####
elif self.partition_connected and not self.IPCPartition(self.partition).isValid():
- self.check_logger.warning('Lost connection to partition %s, removing ERS handlers', self.partition)
+ self.logger.warning('Lost connection to partition %s, removing ERS handlers', self.partition)
self.partition_connected = False
##### Remove ERS handlers from all loggers #####
self.change_state_ers(False)
@@ -97,16 +97,16 @@ class CheckThread(threading.Thread):
def change_state_ers(self, create_ers_handler):
if create_ers_handler:
##### Add ERS handler to all loggers #####
- self.logger.addHandler(self.main_ERS_handler)
- self.check_logger.addHandler(self.check_ERS_handler)
+ self.mainLogger.addHandler(self.main_ERS_handler)
+ self.logger.addHandler(self.check_ERS_handler)
self.copy.AddRemoveERS(True)
self.manager.AddRemoveERS(True)
if self.delete:
self.delete.AddRemoveERS(True)
else:
##### Remove ERS from all loggers #####
- self.logger.removeHandler(self.main_ERS_handler)
- self.check_logger.removeHandler(self.check_ERS_handler)
+ self.mainLogger.removeHandler(self.main_ERS_handler)
+ self.logger.removeHandler(self.check_ERS_handler)
self.copy.AddRemoveERS(False)
self.manager.AddRemoveERS(False)
if self.delete:
@@ -118,5 +118,5 @@ class CheckThread(threading.Thread):
##### Exit handler #####
def checkExit(self):
self.exitFlag = True
- self.check_logger.info('Exit signal received')
+ self.logger.info('Exit signal received')
# end def checkExit()
--
GitLab