From 0eef04406af3bf1b3016ef8939922673d34d4dd8 Mon Sep 17 00:00:00 2001 From: VeNoMouS Date: Thu, 11 Aug 2016 10:57:40 +1200 Subject: [PATCH 1/4] Honour logging settings from config to disable log level. --- pokemongo_bot/__init__.py | 4 ++-- .../event_handlers/colored_logging_handler.py | 10 +++++++++- pokemongo_bot/event_handlers/logging_handler.py | 12 +++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index 1b18ac7ff8..c686db38f0 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -90,9 +90,9 @@ def start(self): def _setup_event_system(self): handlers = [] if self.config.logging_color: - handlers.append(ColoredLoggingHandler()) + handlers.append(ColoredLoggingHandler(self)) else: - handlers.append(LoggingHandler()) + handlers.append(LoggingHandler(self)) if self.config.websocket_server_url: if self.config.websocket_start_embedded_server: diff --git a/pokemongo_bot/event_handlers/colored_logging_handler.py b/pokemongo_bot/event_handlers/colored_logging_handler.py index f3c902d464..26c993fd67 100644 --- a/pokemongo_bot/event_handlers/colored_logging_handler.py +++ b/pokemongo_bot/event_handlers/colored_logging_handler.py @@ -97,7 +97,8 @@ class ColoredLoggingHandler(EventHandler): 'cyan': '96' } - def __init__(self): + def __init__(self, bot): + self.bot = bot self._last_event = None try: # this `try ... except` is for ImportError on Windows @@ -110,6 +111,13 @@ def __init__(self): self._TIOCGWINSZ = None def handle_event(self, event, sender, level, formatted_msg, data): + + # Honour config settings if log level disabled + for event_level in ['info', 'warning', 'error', 'critical', 'debug']: + if hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level) and event_level == level: + self._last_event = event + return + # Prepare message string message = None if formatted_msg: diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index 7ad5720f6a..464d6cda1c 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -8,8 +8,18 @@ class LoggingHandler(EventHandler): - + + def __init__(self, bot): + self.bot = bot + def handle_event(self, event, sender, level, formatted_msg, data): + + # Honour config settings if log level disabled + for event_level in ['info', 'warning', 'error', 'critical', 'debug']: + if hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level) and event_level == level: + self._last_event = event + return + logger = logging.getLogger(type(sender).__name__) if formatted_msg: message = "[{}] {}".format(event, formatted_msg) From 457695859f54d3553a9981d548cfa573d98dec96 Mon Sep 17 00:00:00 2001 From: VeNoMouS Date: Thu, 11 Aug 2016 11:03:46 +1200 Subject: [PATCH 2/4] Logic order. --- pokemongo_bot/event_handlers/colored_logging_handler.py | 2 +- pokemongo_bot/event_handlers/logging_handler.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pokemongo_bot/event_handlers/colored_logging_handler.py b/pokemongo_bot/event_handlers/colored_logging_handler.py index 26c993fd67..a25a481350 100644 --- a/pokemongo_bot/event_handlers/colored_logging_handler.py +++ b/pokemongo_bot/event_handlers/colored_logging_handler.py @@ -114,7 +114,7 @@ def handle_event(self, event, sender, level, formatted_msg, data): # Honour config settings if log level disabled for event_level in ['info', 'warning', 'error', 'critical', 'debug']: - if hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level) and event_level == level: + if event_level == level and hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level): self._last_event = event return diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index 464d6cda1c..511f0e2ed9 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -14,9 +14,9 @@ def __init__(self, bot): def handle_event(self, event, sender, level, formatted_msg, data): - # Honour config settings if log level disabled + # Honour config settings if log level disabled for event_level in ['info', 'warning', 'error', 'critical', 'debug']: - if hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level) and event_level == level: + if event_level == level and hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level): self._last_event = event return From 259098c096eb915434562a62080e313c4315cca7 Mon Sep 17 00:00:00 2001 From: VeNoMouS Date: Thu, 11 Aug 2016 11:05:04 +1200 Subject: [PATCH 3/4] Bad var. --- pokemongo_bot/event_handlers/logging_handler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index 511f0e2ed9..537e6adbe2 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -17,7 +17,6 @@ def handle_event(self, event, sender, level, formatted_msg, data): # Honour config settings if log level disabled for event_level in ['info', 'warning', 'error', 'critical', 'debug']: if event_level == level and hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level): - self._last_event = event return logger = logging.getLogger(type(sender).__name__) From 7a8035b636930e6d77dae0778b7145e4f99b00ce Mon Sep 17 00:00:00 2001 From: VeNoMouS Date: Thu, 11 Aug 2016 11:46:36 +1200 Subject: [PATCH 4/4] No need for a loop. --- pokemongo_bot/event_handlers/colored_logging_handler.py | 9 ++++----- pokemongo_bot/event_handlers/logging_handler.py | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pokemongo_bot/event_handlers/colored_logging_handler.py b/pokemongo_bot/event_handlers/colored_logging_handler.py index a25a481350..76205ada1d 100644 --- a/pokemongo_bot/event_handlers/colored_logging_handler.py +++ b/pokemongo_bot/event_handlers/colored_logging_handler.py @@ -113,11 +113,10 @@ def __init__(self, bot): def handle_event(self, event, sender, level, formatted_msg, data): # Honour config settings if log level disabled - for event_level in ['info', 'warning', 'error', 'critical', 'debug']: - if event_level == level and hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level): - self._last_event = event - return - + if hasattr(self.bot.config, level) and not getattr(self.bot.config, level): + self._last_event = event + return + # Prepare message string message = None if formatted_msg: diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index 537e6adbe2..1f87414ad8 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -8,16 +8,15 @@ class LoggingHandler(EventHandler): - + def __init__(self, bot): self.bot = bot - + def handle_event(self, event, sender, level, formatted_msg, data): # Honour config settings if log level disabled - for event_level in ['info', 'warning', 'error', 'critical', 'debug']: - if event_level == level and hasattr(self.bot.config, event_level) and not getattr(self.bot.config, event_level): - return + if hasattr(self.bot.config, level) and not getattr(self.bot.config, level): + return logger = logging.getLogger(type(sender).__name__) if formatted_msg: