From 45111898b345541784efc6862d0bbfc530d13597 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Mon, 9 Jul 2018 23:17:42 -0400 Subject: [PATCH] make it easier to configure logging for electrumx (#514) * make it easier to configure logging for electrumx --- electrumx/lib/env_base.py | 3 ++- electrumx/lib/server_base.py | 3 ++- electrumx/server/block_processor.py | 3 ++- electrumx/server/daemon.py | 3 ++- electrumx/server/db.py | 3 ++- electrumx/server/history.py | 3 ++- electrumx/server/mempool.py | 3 ++- electrumx/server/peers.py | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/electrumx/lib/env_base.py b/electrumx/lib/env_base.py index 0a929a7..df50113 100644 --- a/electrumx/lib/env_base.py +++ b/electrumx/lib/env_base.py @@ -19,7 +19,8 @@ class EnvBase(object): pass def __init__(self): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.allow_root = self.boolean('ALLOW_ROOT', False) self.host = self.default('HOST', 'localhost') self.rpc_host = self.default('RPC_HOST', 'localhost') diff --git a/electrumx/lib/server_base.py b/electrumx/lib/server_base.py index 9d2e000..654165d 100644 --- a/electrumx/lib/server_base.py +++ b/electrumx/lib/server_base.py @@ -36,7 +36,8 @@ class ServerBase(object): '''Save the environment, perform basic sanity checks, and set the event loop policy. ''' - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.env = env # Sanity checks diff --git a/electrumx/server/block_processor.py b/electrumx/server/block_processor.py index 779e1ff..7aaf019 100644 --- a/electrumx/server/block_processor.py +++ b/electrumx/server/block_processor.py @@ -26,7 +26,8 @@ class Prefetcher(object): '''Prefetches blocks (in the forward direction only).''' def __init__(self, bp): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.bp = bp self.caught_up = False # Access to fetched_height should be protected by the semaphore diff --git a/electrumx/server/daemon.py b/electrumx/server/daemon.py index f828666..767df89 100644 --- a/electrumx/server/daemon.py +++ b/electrumx/server/daemon.py @@ -37,7 +37,8 @@ class Daemon(object): '''Raised when the daemon returns an error in its results.''' def __init__(self, env): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.coin = env.coin self.set_urls(env.coin.daemon_urls(env.daemon_url)) self._height = None diff --git a/electrumx/server/db.py b/electrumx/server/db.py index 5146f4c..1fed44f 100644 --- a/electrumx/server/db.py +++ b/electrumx/server/db.py @@ -42,7 +42,8 @@ class DB(object): '''Raised on general DB errors generally indicating corruption.''' def __init__(self, env): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.env = env self.coin = env.coin diff --git a/electrumx/server/history.py b/electrumx/server/history.py index 52d597e..011840d 100644 --- a/electrumx/server/history.py +++ b/electrumx/server/history.py @@ -25,7 +25,8 @@ class History(object): DB_VERSIONS = [0] def __init__(self): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) # For history compaction self.max_hist_row_entries = 12500 self.unflushed = defaultdict(partial(array.array, 'I')) diff --git a/electrumx/server/mempool.py b/electrumx/server/mempool.py index e0da9b7..5bfa374 100644 --- a/electrumx/server/mempool.py +++ b/electrumx/server/mempool.py @@ -33,7 +33,8 @@ class MemPool(object): ''' def __init__(self, bp, controller): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) self.daemon = bp.daemon self.controller = controller self.coin = bp.coin diff --git a/electrumx/server/peers.py b/electrumx/server/peers.py index 15c3d6c..93b041e 100644 --- a/electrumx/server/peers.py +++ b/electrumx/server/peers.py @@ -224,7 +224,8 @@ class PeerManager(object): Issues a 'peers.subscribe' RPC to them and tells them our data. ''' def __init__(self, env, controller): - self.logger = logging.getLogger(self.__class__.__name__) + self.logger = logging.getLogger(__name__)\ + .getChild(self.__class__.__name__) # Initialise the Peer class Peer.DEFAULT_PORTS = env.coin.PEER_DEFAULT_PORTS self.env = env