Skip to content

Commit 4d9ff09

Browse files
Add logger adapter with bugbot_rule context (#2753)
1 parent 033f2ea commit 4d9ff09

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

bugbot/__init__.py

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,29 @@ def get_version():
5555
raise
5656

5757

58-
path = utils.get_config("common", "log")
59-
60-
logger = logging.getLogger()
61-
logger.setLevel(logging.INFO)
62-
handler = logging.StreamHandler(sys.stdout)
63-
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
64-
handler.setFormatter(formatter)
65-
logger.addHandler(handler)
66-
67-
error = logging.FileHandler(path)
68-
error.setLevel(logging.ERROR)
69-
error.setFormatter(formatter)
70-
logger.addHandler(error)
58+
logger_extra = {"bugbot_rule": None}
59+
60+
61+
def create_logger(logger_extra):
62+
path = utils.get_config("common", "log")
63+
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
64+
65+
logger = logging.getLogger()
66+
logger.setLevel(logging.INFO)
67+
68+
handler = logging.StreamHandler(sys.stdout)
69+
handler.setFormatter(formatter)
70+
logger.addHandler(handler)
71+
72+
error = logging.FileHandler(path)
73+
error.setLevel(logging.ERROR)
74+
error.setFormatter(formatter)
75+
logger.addHandler(error)
76+
77+
return logging.LoggerAdapter(logger, logger_extra)
78+
79+
80+
logger = create_logger(logger_extra)
7181

7282

7383
def _handle_uncaught_exception(exc_type, exc_value, exc_traceback):

bugbot/bzcleaner.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from libmozdata import utils as lmdutils
1818
from libmozdata.bugzilla import Bugzilla
1919

20-
from bugbot import db, logger, mail, utils
20+
from bugbot import db, logger, logger_extra, mail, utils
2121
from bugbot.cache import Cache
2222
from bugbot.nag_me import Nag
2323

@@ -842,6 +842,8 @@ def get_args_parser(self):
842842

843843
def run(self):
844844
"""Run the rule"""
845+
logger_extra["bugbot_rule"] = self.name()
846+
845847
args = self.get_args_parser().parse_args()
846848
self.parse_custom_arguments(args)
847849
date = "" if self.ignore_date() else args.date

0 commit comments

Comments
 (0)