Using sublog for modules

olxbr · Apr 20, 2020 · 41b4910 · 41b4910
1 parent 3e5d08b
commit 41b4910
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/barterdude/conf.py b/barterdude/conf.py
@@ -16,13 +16,11 @@
     '(levelname) (name) (pathname) (lineno)',
     timestamp=True
 ))
+default_logger = logging.getLogger(BARTERDUDE_DEFAULT_LOG_NAME)
 
 
-def getLogger(
-    name=BARTERDUDE_DEFAULT_LOG_NAME,
-    level=BARTERDUDE_DEFAULT_LOG_LEVEL
-):
-    logger = logging.getLogger(name)
-    logger.setLevel(level)
+def getLogger(name, level=BARTERDUDE_DEFAULT_LOG_LEVEL):
+    logger = default_logger.getChild(name)
     logger.addHandler(handler)
+    logger.setLevel(level)
     return logger
diff --git a/barterdude/hooks/logging.py b/barterdude/hooks/logging.py
@@ -3,15 +3,15 @@
 from asyncworker.rabbitmq.message import RabbitMQMessage
 
 from barterdude.conf import (
-    getLogger, BARTERDUDE_DEFAULT_LOG_NAME, BARTERDUDE_DEFAULT_LOG_LEVEL
+    getLogger, BARTERDUDE_DEFAULT_LOG_LEVEL
 )
 from barterdude.hooks import BaseHook
 
 
 class Logging(BaseHook):
 
     def __init__(
-        self, name=BARTERDUDE_DEFAULT_LOG_NAME,
+        self, name="hook.logging",
         level=BARTERDUDE_DEFAULT_LOG_LEVEL
     ):
         self._logger = getLogger(name, level)

diff --git a/barterdude/monitor.py b/barterdude/monitor.py
@@ -4,13 +4,14 @@
 from asyncio import gather
 from asyncworker.rabbitmq.message import RabbitMQMessage
 
-from barterdude.conf import getLogger
+from barterdude.conf import getLogger, BARTERDUDE_DEFAULT_LOG_LEVEL
 
 
 class Monitor:
     def __init__(self, *hooks: Iterable):
         self.__hooks = hooks
-        self._logger = getLogger()
+        self._logger = getLogger(
+            "hook.monitor", BARTERDUDE_DEFAULT_LOG_LEVEL)
 
     async def _callback(self,
                         method: Callable[[RabbitMQMessage], Optional[Any]],

diff --git a/tests/test_conf.py b/tests/test_conf.py
@@ -14,44 +14,44 @@ def setUp(self):
         self.log_level = BARTERDUDE_DEFAULT_LOG_LEVEL
 
     async def test_should_get_log_with_default_configs(self):
-        logger = getLogger()
+        logger = getLogger("test")
         self.assertEqual(
             type(logger.handlers[0]),
             logging.StreamHandler
         )
-        self.assertEqual(logger.name, self.log_name)
+        self.assertEqual(logger.name, f"{self.log_name}.test")
         self.assertEqual(logger.level, self.log_level)
         self.assertEqual(
             type(logger.handlers[0].formatter),
             jsonlogger.JsonFormatter
         )
 
     async def test_should_get_log_with_custom_configs(self):
-        logger = getLogger("test_log", logging.DEBUG)
+        logger = getLogger("test", logging.DEBUG)
         self.assertEqual(
             type(logger.handlers[0]),
             logging.StreamHandler
         )
-        self.assertEqual(logger.name, "test_log")
+        self.assertEqual(logger.name, f"{self.log_name}.test")
         self.assertEqual(logger.level, logging.DEBUG)
         self.assertEqual(
             type(logger.handlers[0].formatter),
             jsonlogger.JsonFormatter
         )
 
     async def test_should_get_log_with_custom_configs_even_called_after(self):
-        logger_first = getLogger()
-        logger = getLogger("test_log", logging.DEBUG)
-        logger_last = getLogger()
+        logger_first = getLogger("test_log")
+        logger = getLogger("test", logging.DEBUG)
+        logger_last = getLogger("test_log")
         self.assertEqual(
             type(logger.handlers[0]),
             logging.StreamHandler
         )
-        self.assertEqual(logger_first.name, self.log_name)
+        self.assertEqual(logger_first.name, f"{self.log_name}.test_log")
         self.assertEqual(logger_first.level, self.log_level)
-        self.assertEqual(logger.name, "test_log")
+        self.assertEqual(logger.name, f"{self.log_name}.test")
         self.assertEqual(logger.level, logging.DEBUG)
-        self.assertEqual(logger_last.name, self.log_name)
+        self.assertEqual(logger_last.name, f"{self.log_name}.test_log")
         self.assertEqual(logger_last.level, self.log_level)
         self.assertEqual(
             type(logger.handlers[0].formatter),

diff --git a/tests/test_hooks/test_logging.py b/tests/test_hooks/test_logging.py
@@ -1,6 +1,7 @@
 import logging
 from asynctest import TestCase, Mock, patch
 from barterdude.hooks.logging import Logging
+from barterdude.conf import BARTERDUDE_DEFAULT_LOG_NAME
 
 
 class TestLogging(TestCase):
@@ -21,7 +22,7 @@ async def test_should_access_logger(self):
             type(logger.handlers[0]),
             logging.StreamHandler
         )
-        self.assertEqual(logger.name, "my_log")
+        self.assertEqual(logger.name, f"{BARTERDUDE_DEFAULT_LOG_NAME}.my_log")
         self.assertEqual(logger.level, logging.DEBUG)
 
     @patch("barterdude.hooks.logging.Logging.logger")