Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pokemongo_bot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion pokemongo_bot/event_handlers/colored_logging_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -110,6 +111,12 @@ def __init__(self):
self._TIOCGWINSZ = None

def handle_event(self, event, sender, level, formatted_msg, data):

# Honour config settings if log level disabled
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:
Expand Down
8 changes: 8 additions & 0 deletions pokemongo_bot/event_handlers/logging_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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
if hasattr(self.bot.config, level) and not getattr(self.bot.config, level):
return

logger = logging.getLogger(type(sender).__name__)
if formatted_msg:
message = "[{}] {}".format(event, formatted_msg)
Expand Down