Moves Logger to common

pisa/api.py

@@ -3,7 +3,7 @@ import json
 from flask import Flask, request, abort, jsonify
 
 from pisa import HOST, PORT, logging
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.inspector import Inspector
 from pisa.appointment import Appointment
 from pisa.block_processor import BlockProcessor

pisa/block_processor.py

@@ -1,4 +1,4 @@
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.tools import bitcoin_cli
 from pisa.utils.auth_proxy import JSONRPCException
 

pisa/carrier.py

@@ -1,5 +1,5 @@
 from pisa.rpc_errors import *
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.tools import bitcoin_cli
 from pisa.utils.auth_proxy import JSONRPCException
 from pisa.errors import UNKNOWN_JSON_RPC_EXCEPTION, RPC_TX_REORGED_AFTER_BROADCAST

pisa/cleaner.py

@@ -1,4 +1,4 @@
-from pisa.logger import Logger
+from common.logger import Logger
 
 logger = Logger("Cleaner")
 

pisa/db_manager.py

@@ -1,7 +1,7 @@
 import json
 import plyvel
 
-from pisa.logger import Logger
+from common.logger import Logger
 
 logger = Logger("DBManager")
 

pisa/inspector.py

@@ -6,7 +6,7 @@ from common.cryptographer import Cryptographer
 
 from pisa import errors
 import pisa.conf as conf
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.appointment import Appointment
 from pisa.block_processor import BlockProcessor
 

pisa/logger.py

@@ -1,83 +0,0 @@
-import time
-import json
-
-from pisa import f_logger, c_logger
-
-
-class _StructuredMessage:
-    def __init__(self, message, **kwargs):
-        self.message = message
-        self.time = time.asctime()
-        self.kwargs = kwargs
-
-    def __str__(self):
-        return {**self.kwargs, "message": self.message, "time": self.time}
-
-
-class Logger:
-    """
-    The :class:`Logger` is the class in charge of logging events into the log file.
-
-    Args:
-        actor (:obj:`str`): the system actor that is logging the event (e.g. ``Watcher``, ``Cryptographer``, ...).
-    """
-
-    def __init__(self, actor=None):
-        self.actor = actor
-
-    def _add_prefix(self, msg):
-        return msg if self.actor is None else "[{}] {}".format(self.actor, msg)
-
-    def _create_console_message(self, msg, **kwargs):
-        return _StructuredMessage(self._add_prefix(msg), actor=self.actor, **kwargs).message
-
-    def _create_file_message(self, msg, **kwargs):
-        return json.dumps(_StructuredMessage(msg, actor=self.actor, **kwargs).__str__())
-
-    def info(self, msg, **kwargs):
-        """
-        Logs an ``INFO`` level message to stdout and file.
-
-        Args:
-             msg (:obj:`str`): the message to be logged.
-             kwargs: a ``key:value`` collection parameters to be added to the output.
-        """
-
-        f_logger.info(self._create_file_message(msg, **kwargs))
-        c_logger.info(self._create_console_message(msg, **kwargs))
-
-    def debug(self, msg, **kwargs):
-        """
-        Logs an ``DEBUG`` level message to stdout and file.
-
-        Args:
-             msg (:obj:`str`): the message to be logged.
-             kwargs: a ``key:value`` collection parameters to be added to the output.
-        """
-
-        f_logger.debug(self._create_file_message(msg, **kwargs))
-        c_logger.debug(self._create_console_message(msg, **kwargs))
-
-    def error(self, msg, **kwargs):
-        """
-        Logs an ``ERROR`` level message to stdout and file.
-
-        Args:
-             msg (:obj:`str`): the message to be logged.
-             kwargs: a ``key:value`` collection parameters to be added to the output.
-        """
-
-        f_logger.error(self._create_file_message(msg, **kwargs))
-        c_logger.error(self._create_console_message(msg, **kwargs))
-
-    def warning(self, msg, **kwargs):
-        """
-        Logs an ``WARNING`` level message to stdout and file.
-
-        Args:
-             msg (:obj:`str`): the message to be logged.
-             kwargs: a ``key:value`` collection parameters to be added to the output.
-        """
-
-        f_logger.warning(self._create_file_message(msg, **kwargs))
-        c_logger.warning(self._create_console_message(msg, **kwargs))

pisa/pisad.py

@@ -3,7 +3,7 @@ from sys import argv, exit
 from signal import signal, SIGINT, SIGQUIT, SIGTERM
 
 from pisa.conf import DB_PATH
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.api import start_api
 from pisa.watcher import Watcher
 from pisa.builder import Builder

pisa/responder.py

@@ -2,7 +2,7 @@ import json
 from queue import Queue
 from threading import Thread
 
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.cleaner import Cleaner
 from pisa.carrier import Carrier
 from pisa.block_processor import BlockProcessor

pisa/utils/zmq_subscriber.py

@@ -1,6 +1,6 @@
 import zmq
 import binascii
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.conf import FEED_PROTOCOL, FEED_ADDR, FEED_PORT
 
 

pisa/watcher.py

@@ -5,7 +5,7 @@ from threading import Thread
 from common.cryptographer import Cryptographer
 from common.constants import LOCATOR_LEN_HEX
 
-from pisa.logger import Logger
+from common.logger import Logger
 from pisa.cleaner import Cleaner
 from pisa.responder import Responder
 from pisa.block_processor import BlockProcessor