diff --git a/sandbox/logging/CentralLogger.py b/sandbox/logging/CentralLogger.py index b4db3cb84e35942367f198ca9e1f541925079938..adb396ea3c7bb029ba8033ad00253ef11bc598ad 100644 --- a/sandbox/logging/CentralLogger.py +++ b/sandbox/logging/CentralLogger.py @@ -38,14 +38,14 @@ class CentralLogger(Device): i+=1 """Logs are received from all element devices at all levels. - Filteration happens within the log function depending upon + Filtering happens within the log function depending upon CentralLoggingLevel of each element device. NOTE : This fiteration logic is still under consideration.""" @command(dtype_in='DevVarStringArray', dtype_out=None) def log(self, details): - cmessage = details[3] + cmessage = details[3] clevel = details[1] - tango_log_level = {"FATAL":1,"ERROR":2,"WARN":3,"INFO":4,"DEBUG":5} + tango_log_level = {"FATAL": 1, "ERROR": 2, "WARN": 3, "INFO": 4, "DEBUG": 5} level_number = tango_log_level[clevel] clogsource = details[2] if clogsource == details[2]: @@ -53,15 +53,15 @@ class CentralLogger(Device): deviceLogLevel = device.centralLoggingLevel if clevel == "FATAL" and level_number <= deviceLogLevel: - self.fatal_stream("%s : %s",clogsource, cmessage) + self.fatal_stream("%s : %s", clogsource, cmessage) elif clevel == "ERROR" and level_number <= deviceLogLevel: - self.error_stream("%s : %s",clogsource, cmessage) + self.error_stream("%s : %s", clogsource, cmessage) elif clevel == "WARN" and level_number <= deviceLogLevel: - self.warn_stream("%s : %s",clogsource, cmessage) + self.warn_stream("%s : %s", clogsource, cmessage) elif clevel == "INFO" and level_number <= deviceLogLevel: - self.info_stream("%s : %s",clogsource, cmessage) + self.info_stream("%s : %s", clogsource, cmessage) elif clevel == "DEBUG" and level_number <= deviceLogLevel: - self.debug_stream("%s : %s",clogsource, cmessage) + self.debug_stream("%s : %s", clogsource, cmessage) else: pass else: diff --git a/sandbox/logging/ElementLogger.py b/sandbox/logging/ElementLogger.py index a5438c212188225d1b9dec3756434454c2037d7f..3d638533bde3468a362da852e97a01835a1a0f91 100644 --- a/sandbox/logging/ElementLogger.py +++ b/sandbox/logging/ElementLogger.py @@ -51,29 +51,29 @@ class ElementLogger(Device): i+=1 """Logs are received from all element devices at all levels. - Filteration happens within the log function depending upon + Filtering happens within the log function depending upon ElementLoggingLevel of each element device. NOTE : This fiteration logic is still under consideration.""" @command(dtype_in='DevVarStringArray', dtype_out=None) def log(self, details): - message = details[3] + message = details[3] level = details[1] - tango_log_level = {"FATAL":1,"ERROR":2,"WARN":3,"INFO":4,"DEBUG":5} + tango_log_level = {"FATAL": 1, "ERROR": 2, "WARN": 3, "INFO": 4, "DEBUG": 5} level_number = tango_log_level[level] logsource = details[2] if logsource == details[2]: device = DeviceProxy(logsource) deviceLogLevel = device.elementLoggingLevel if level == "FATAL" and level_number <= deviceLogLevel: - self.fatal_stream("%s : %s",logsource, message) + self.fatal_stream("%s : %s", logsource, message) elif level == "ERROR" and level_number <= deviceLogLevel: - self.error_stream("%s : %s",logsource, message) + self.error_stream("%s : %s", logsource, message) elif level == "WARN" and level_number <= deviceLogLevel: - self.warn_stream("%s : %s",logsource, message) + self.warn_stream("%s : %s", logsource, message) elif level == "INFO" and level_number <= deviceLogLevel: - self.info_stream("%s : %s",logsource, message) + self.info_stream("%s : %s", logsource, message) elif level == "DEBUG" and level_number <= deviceLogLevel: - self.debug_stream("%s : %s",logsource, message) + self.debug_stream("%s : %s", logsource, message) else: pass else: