From b39f92b82054677641992fa745b544581d9c9e17 Mon Sep 17 00:00:00 2001
From: Valerij Maljulin <vmaljuli@redhat.com>
Date: Mar 13 2019 12:38:08 +0000
Subject: Categorize log messages

This fixes #1064

Signed-off-by: Valerij Maljulin <vmaljuli@redhat.com>

---

diff --git a/module_build_service/__init__.py b/module_build_service/__init__.py
index cd5016f..7e7efd2 100644
--- a/module_build_service/__init__.py
+++ b/module_build_service/__init__.py
@@ -50,7 +50,7 @@ gi.require_version('Modulemd', '1.0')  # noqa
 from gi.repository import Modulemd  # noqa
 
 from module_build_service.logger import (
-    init_logging, ModuleBuildLogs, level_flags)
+    init_logging, ModuleBuildLogs, level_flags, MBSLogger)
 
 from module_build_service.errors import (
     ValidationError, Unauthorized, UnprocessableEntity, Conflict, NotFound,
@@ -154,7 +154,7 @@ def notfound_error(e):
 
 
 init_logging(conf)
-log = getLogger(__name__)
+log = MBSLogger()
 build_logs = ModuleBuildLogs(
     conf.build_logs_dir,
     conf.build_logs_name_format,
diff --git a/module_build_service/logger.py b/module_build_service/logger.py
index d03f4f0..c8e86f8 100644
--- a/module_build_service/logger.py
+++ b/module_build_service/logger.py
@@ -44,6 +44,7 @@ logging.warning("%s failed to build", task_id)
 
 import os
 import logging
+import inspect
 
 levels = {}
 levels["debug"] = logging.DEBUG
@@ -149,6 +150,59 @@ class ModuleBuildLogs(object):
         del self.handlers[build.id]
 
 
+class MBSLogger:
+    def __init__(self):
+        self._logger = logging.getLogger('MBS')
+        self._level = logging.NOTSET
+        self._current_path = os.path.dirname(os.path.realpath(__file__))
+
+    @property
+    def logger(self):
+        return self._logger
+
+    @property
+    def level(self):
+        return self._level
+
+    @level.setter
+    def level(self, level):
+        self._level = level
+        self.logger.setLevel(self._level)
+
+    def setLevel(self, level):
+        self.level = level
+
+    def debug(self, *args, **kwargs):
+        return self._log_call('debug', args, kwargs)
+
+    def info(self, *args, **kwargs):
+        return self._log_call('info', args, kwargs)
+
+    def warning(self, *args, **kwargs):
+        return self._log_call('warning', args, kwargs)
+
+    def error(self, *args, **kwargs):
+        return self._log_call('error', args, kwargs)
+
+    def critical(self, *args, **kwargs):
+        return self._log_call('critical', args, kwargs)
+
+    def exception(self, *args, **kwargs):
+        return self._log_call('exception', args, kwargs)
+
+    def log(self, *args, **kwargs):
+        return self._log_call('log', args, kwargs)
+
+    def _log_call(self, level_name, args, kwargs):
+        caller_filename = inspect.stack()[2][1]
+        caller_filename = os.path.normpath(caller_filename)
+        if not caller_filename.startswith(self._current_path):
+            log_name = 'MBS'
+        else:
+            log_name = 'MBS' + caller_filename[len(self._current_path):-3].replace('/', '.')
+        return getattr(logging.getLogger(log_name), level_name)(*args, **kwargs)
+
+
 def str_to_log_level(level):
     """
     Returns internal representation of logging level defined
@@ -174,9 +228,9 @@ def init_logging(conf):
 
     if not log_backend or len(log_backend) == 0 or log_backend == "console":
         logging.basicConfig(level=conf.log_level, format=log_format)
-        log = logging.getLogger()
-        log.setLevel(conf.log_level)
+        log = MBSLogger()
+        log.level = conf.log_level
     else:
         logging.basicConfig(filename=conf.log_file, level=conf.log_level,
                             format=log_format)
-        log = logging.getLogger()
+        log = MBSLogger()
diff --git a/tests/test_logger.py b/tests/test_logger.py
index 36a6f7d..d0f5063 100644
--- a/tests/test_logger.py
+++ b/tests/test_logger.py
@@ -104,7 +104,7 @@ class TestLogger:
             data = f.read()
             # Note that DEBUG is not present unless configured server-wide.
             for level in ["INFO", "WARNING", "ERROR"]:
-                assert data.find("%s - ignore this test msg2" % level) != -1
+                assert data.find("MBS - {0} - ignore this test msg2".format(level)) != -1
 
         # Try to log more messages when build_log for module 1 is stopped.
         # New messages should not appear in a log.