catarrh/pysim-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pySimLogger: user __name__ of the module when creating a new logger

Browse Source 
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. For the top level modules let's use the program
name so that it will show up in the log instead of __init__.

Change-Id: I49a9beb98845f66247edd42ed548980c97a7151a
This commit is contained in:
Philipp Maier
2026-01-20 12:42:16 +01:00
parent 167d6aca36
commit 2b42877389
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/csv-to-pgsql.py
View File

@@ -12,7 +12,7 @@ from pathlib import Path
from pySim.log import PySimLogger from pySim.log import PySimLogger
from packaging import version from packaging import version
log = PySimLogger.get("CSV2PGQSL") log = PySimLogger.get(Path(__file__).stem)
class CardKeyDatabase: class CardKeyDatabase:
def __init__(self, config_filename: str, table_name: str, create_table: bool = False, admin: bool = False): def __init__(self, config_filename: str, table_name: str, create_table: bool = False, admin: bool = False):
@@ -35,7 +35,6 @@ class CardKeyDatabase:
raise ValueError("user for role '%s' not set up in config file." % role) raise ValueError("user for role '%s' not set up in config file." % role)
return user.get('name'), user.get('pass') return user.get('name'), user.get('pass')
log = PySimLogger.get("PGSQL")
self.table = table_name.lower() self.table = table_name.lower()
self.cols = None self.cols = None

3
contrib/es2p_server.py
View File

@@ -31,8 +31,9 @@ from pySim.esim.es2p import param, Es2pApiServerMno, Es2pApiServerHandlerMno
from osmocom.utils import b2h from osmocom.utils import b2h
from datetime import datetime from datetime import datetime
from analyze_simaResponse import split_sima_response from analyze_simaResponse import split_sima_response
from pathlib import Path
logger = logging.getLogger(__name__) logger = logging.getLogger(Path(__file__).stem)
parser = argparse.ArgumentParser(description=""" parser = argparse.ArgumentParser(description="""
Utility to receive and log requests against the ES2+ API of an SM-DP+ according to GSMA SGP.22.""") Utility to receive and log requests against the ES2+ API of an SM-DP+ according to GSMA SGP.22.""")

2
pySim-shell.py
View File

@@ -74,7 +74,7 @@ from pySim.card_key_provider import card_key_provider_register, card_key_provide
from pySim.app import init_card from pySim.app import init_card
log = PySimLogger.get("main") log = PySimLogger.get(Path(__file__).stem)
class Cmd2Compat(cmd2.Cmd): class Cmd2Compat(cmd2.Cmd):
"""Backwards-compatibility wrapper around cmd2.Cmd to support older and newer """Backwards-compatibility wrapper around cmd2.Cmd to support older and newer

2
pySim/card_key_provider.py
View File

@@ -38,7 +38,7 @@ import csv
import logging import logging
import yaml import yaml
log = PySimLogger.get("CARDKEY") log = PySimLogger.get(__name__)
card_key_providers = [] # type: List['CardKeyProvider'] card_key_providers = [] # type: List['CardKeyProvider']

2
pySim/log.py
View File

@@ -44,7 +44,7 @@ class PySimLogger:
""" """
LOG_FMTSTR = "%(levelname)s: %(message)s" 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 = logging.Formatter(LOG_FMTSTR)
__formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE) __formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE)

2
pySim/runtime.py
View File

@@ -26,7 +26,7 @@ from pySim.exceptions import *
from pySim.filesystem import * from pySim.filesystem import *
from pySim.log import PySimLogger from pySim.log import PySimLogger
log = PySimLogger.get("RUNTIME") log = PySimLogger.get(__name__)
def lchan_nr_from_cla(cla: int) -> int: def lchan_nr_from_cla(cla: int) -> int:
"""Resolve the logical channel number from the CLA byte.""" """Resolve the logical channel number from the CLA byte."""

12
tests/unittests/test_log.py
View File

@@ -25,7 +25,7 @@ import io
import sys import sys
from inspect import currentframe, getframeinfo from inspect import currentframe, getframeinfo
log = PySimLogger.get("TEST") log = PySimLogger.get(__name__)
TEST_MSG_DEBUG = "this is a debug message" TEST_MSG_DEBUG = "this is a debug message"
TEST_MSG_INFO = "this is an info message" TEST_MSG_INFO = "this is an info message"
@@ -82,15 +82,15 @@ class PySimLogger_Test(unittest.TestCase):
PySimLogger.setup(self._test_print_callback) PySimLogger.setup(self._test_print_callback)
PySimLogger.set_verbose(True) PySimLogger.set_verbose(True)
frame = currentframe() 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) 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) 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) 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) 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) log.critical(TEST_MSG_CRITICAL)
def test_04_level(self): def test_04_level(self):