mirror of
https://github.com/aljazceru/python-teos.git
synced 2025-12-17 14:14:22 +01:00
Fixes logger not properly working for cli
The Logger was set to use c_logger and f_logger from pisad, so the cli file logs were never created
This commit is contained in:
@@ -1,8 +1,7 @@
|
|||||||
import json
|
import json
|
||||||
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from pisa import f_logger, c_logger
|
|
||||||
|
|
||||||
|
|
||||||
class _StructuredMessage:
|
class _StructuredMessage:
|
||||||
def __init__(self, message, **kwargs):
|
def __init__(self, message, **kwargs):
|
||||||
@@ -22,8 +21,10 @@ class Logger:
|
|||||||
actor (:obj:`str`): the system actor that is logging the event (e.g. ``Watcher``, ``Cryptographer``, ...).
|
actor (:obj:`str`): the system actor that is logging the event (e.g. ``Watcher``, ``Cryptographer``, ...).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, actor=None):
|
def __init__(self, log_name_prefix, actor=None):
|
||||||
self.actor = actor
|
self.actor = actor
|
||||||
|
self.f_logger = logging.getLogger("{}_file_log".format(log_name_prefix))
|
||||||
|
self.c_logger = logging.getLogger("{}_console_log".format(log_name_prefix))
|
||||||
|
|
||||||
def _add_prefix(self, msg):
|
def _add_prefix(self, msg):
|
||||||
return msg if self.actor is None else "[{}]: {}".format(self.actor, msg)
|
return msg if self.actor is None else "[{}]: {}".format(self.actor, msg)
|
||||||
@@ -54,8 +55,8 @@ class Logger:
|
|||||||
kwargs: a ``key:value`` collection parameters to be added to the output.
|
kwargs: a ``key:value`` collection parameters to be added to the output.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
f_logger.info(self._create_file_message(msg, **kwargs))
|
self.f_logger.info(self._create_file_message(msg, **kwargs))
|
||||||
c_logger.info(self._create_console_message(msg, **kwargs))
|
self.c_logger.info(self._create_console_message(msg, **kwargs))
|
||||||
|
|
||||||
def debug(self, msg, **kwargs):
|
def debug(self, msg, **kwargs):
|
||||||
"""
|
"""
|
||||||
@@ -66,8 +67,8 @@ class Logger:
|
|||||||
kwargs: a ``key:value`` collection parameters to be added to the output.
|
kwargs: a ``key:value`` collection parameters to be added to the output.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
f_logger.debug(self._create_file_message(msg, **kwargs))
|
self.f_logger.debug(self._create_file_message(msg, **kwargs))
|
||||||
c_logger.debug(self._create_console_message(msg, **kwargs))
|
self.c_logger.debug(self._create_console_message(msg, **kwargs))
|
||||||
|
|
||||||
def error(self, msg, **kwargs):
|
def error(self, msg, **kwargs):
|
||||||
"""
|
"""
|
||||||
@@ -78,8 +79,8 @@ class Logger:
|
|||||||
kwargs: a ``key:value`` collection parameters to be added to the output.
|
kwargs: a ``key:value`` collection parameters to be added to the output.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
f_logger.error(self._create_file_message(msg, **kwargs))
|
self.f_logger.error(self._create_file_message(msg, **kwargs))
|
||||||
c_logger.error(self._create_console_message(msg, **kwargs))
|
self.c_logger.error(self._create_console_message(msg, **kwargs))
|
||||||
|
|
||||||
def warning(self, msg, **kwargs):
|
def warning(self, msg, **kwargs):
|
||||||
"""
|
"""
|
||||||
@@ -90,5 +91,5 @@ class Logger:
|
|||||||
kwargs: a ``key:value`` collection parameters to be added to the output.
|
kwargs: a ``key:value`` collection parameters to be added to the output.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
f_logger.warning(self._create_file_message(msg, **kwargs))
|
self.f_logger.warning(self._create_file_message(msg, **kwargs))
|
||||||
c_logger.warning(self._create_console_message(msg, **kwargs))
|
self.c_logger.warning(self._create_console_message(msg, **kwargs))
|
||||||
|
|||||||
Reference in New Issue
Block a user