dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/41890?usp=email )
Change subject: pySimLogger: user __name__ of the module when creating a new logger ......................................................................
pySimLogger: user __name__ of the module when creating a new logger
At the moment we use random identifiers as names when we create a new logger for pySimLogger. Let's switch to consistently use the module name here.
Change-Id: I49a9beb98845f66247edd42ed548980c97a7151a --- M contrib/csv-to-pgsql.py M pySim-shell.py M pySim/card_key_provider.py M pySim/log.py M pySim/runtime.py M tests/unittests/test_log.py 6 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/41890/1
diff --git a/contrib/csv-to-pgsql.py b/contrib/csv-to-pgsql.py index 71a5b66..eaaee7f 100755 --- a/contrib/csv-to-pgsql.py +++ b/contrib/csv-to-pgsql.py @@ -12,7 +12,7 @@ from pySim.log import PySimLogger from packaging import version
-log = PySimLogger.get("CSV2PGQSL") +log = PySimLogger.get(__name__)
class CardKeyDatabase: def __init__(self, config_filename: str, table_name: str, create_table: bool = False, admin: bool = False): @@ -35,7 +35,7 @@ raise ValueError("user for role '%s' not set up in config file." % role) return user.get('name'), user.get('pass')
- log = PySimLogger.get("PGSQL") + log = PySimLogger.get(__name__) self.table = table_name.lower() self.cols = None
diff --git a/pySim-shell.py b/pySim-shell.py index be6249d..704e345 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -74,7 +74,7 @@
from pySim.app import init_card
-log = PySimLogger.get("main") +log = PySimLogger.get(__name__)
class Cmd2Compat(cmd2.Cmd): """Backwards-compatibility wrapper around cmd2.Cmd to support older and newer diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 07a55b5..a6cd7ea 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -38,7 +38,7 @@ import logging import yaml
-log = PySimLogger.get("CARDKEY") +log = PySimLogger.get(__name__)
card_key_providers = [] # type: List['CardKeyProvider']
diff --git a/pySim/log.py b/pySim/log.py index c7e5239..85397b6 100644 --- a/pySim/log.py +++ b/pySim/log.py @@ -44,7 +44,7 @@ """
LOG_FMTSTR = "%(levelname)s: %(message)s" - LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- %(name)s - " + LOG_FMTSTR + LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- " + LOG_FMTSTR __formatter = logging.Formatter(LOG_FMTSTR) __formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE)
diff --git a/pySim/runtime.py b/pySim/runtime.py index 19d3538..017bc52 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -26,7 +26,7 @@ from pySim.filesystem import * from pySim.log import PySimLogger
-log = PySimLogger.get("RUNTIME") +log = PySimLogger.get(__name__)
def lchan_nr_from_cla(cla: int) -> int: """Resolve the logical channel number from the CLA byte.""" diff --git a/tests/unittests/test_log.py b/tests/unittests/test_log.py index 6a0f7ff..a8e38dd 100755 --- a/tests/unittests/test_log.py +++ b/tests/unittests/test_log.py @@ -25,7 +25,7 @@ import sys from inspect import currentframe, getframeinfo
-log = PySimLogger.get("TEST") +log = PySimLogger.get(__name__)
TEST_MSG_DEBUG = "this is a debug message" TEST_MSG_INFO = "this is an info message" @@ -82,15 +82,15 @@ PySimLogger.setup(self._test_print_callback) PySimLogger.set_verbose(True) frame = currentframe() - expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - DEBUG: " + TEST_MSG_DEBUG + expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- DEBUG: " + TEST_MSG_DEBUG log.debug(TEST_MSG_DEBUG) - expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - INFO: " + TEST_MSG_INFO + expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- INFO: " + TEST_MSG_INFO log.info(TEST_MSG_INFO) - expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - WARNING: " + TEST_MSG_WARNING + expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- WARNING: " + TEST_MSG_WARNING log.warning(TEST_MSG_WARNING) - expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - ERROR: " + TEST_MSG_ERROR + expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- ERROR: " + TEST_MSG_ERROR log.error(TEST_MSG_ERROR) - expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - CRITICAL: " + TEST_MSG_CRITICAL + expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- CRITICAL: " + TEST_MSG_CRITICAL log.critical(TEST_MSG_CRITICAL)
def test_04_level(self):