January 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bts[master]: Avoid accessing struct log_target members directly
by fixeria 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41882?usp=email ) Change subject: Avoid accessing struct log_target members directly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd48874cf51d6af78305a30faeae48ba518e46b3 Gerrit-Change-Number: 41882 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:12:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmocore[master]: logging: Add APIs to set/get log_{target,context} fields
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41879?usp=email ) Change subject: logging: Add APIs to set/get log_{target,context} fields ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: The jenkins linter is wrong in this case AFAICT? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie48e7e635feb91509b9c034394df4fb16cb931a3 Gerrit-Change-Number: 41879 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:12:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-bts[master]: tests: Use log_set_category_filter() libosmocore API
by pespin 20 Jan '26

20 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email ) Change subject: tests: Use log_set_category_filter() libosmocore API ...................................................................... tests: Use log_set_category_filter() libosmocore API Change-Id: I70d885110d5dd8295136c16f2365efeed443ff1a --- M tests/handover/handover_test.c M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index f1235f5..60496ad 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -70,7 +70,7 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DHO].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DHO, 1, LOGL_DEBUG); g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); if (!g_bts_sm) { diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index c01aa5f..7042c34 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -490,8 +490,8 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DLOOP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index 55a70ed..cb394c8 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -413,8 +413,8 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DLOOP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index e0f88bc..a18a331 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -247,7 +247,7 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70d885110d5dd8295136c16f2365efeed443ff1a Gerrit-Change-Number: 41885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: tests: Use log_set_category_filter() libosmocore API
by fixeria 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email ) Change subject: tests: Use log_set_category_filter() libosmocore API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70d885110d5dd8295136c16f2365efeed443ff1a Gerrit-Change-Number: 41885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:10:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmocore[master]: logging: Make struct log_context and struct log_target private
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email ) Change subject: logging: Make struct log_context and struct log_target private ...................................................................... logging: Make struct log_context and struct log_target private Change-Id: Iecbd07995ccb465a44be0debcc97458b2b240a0e --- M TODO-RELEASE M include/osmocom/core/logging.h M include/osmocom/core/logging_internal.h M src/core/logging.c M src/core/logging_gsmtap.c M src/core/logging_syslog.c M src/core/loggingrb.c 7 files changed, 115 insertions(+), 111 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/41891/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b7d1585..d42d650 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ core added gsmtap_source_set_nonblock(), gsmtap_source_using_wq() core added osmo_iofd_set_name_f() core added log_{get,set}_filter(_data)(), log_get_context() +core deleted struct log_context, struct log_target members made private diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 286f646..0c85a6e 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -9,7 +9,6 @@ #include <stdarg.h> #include <stdbool.h> #include <osmocom/core/defs.h> -#include <osmocom/core/linuxlist.h> extern struct log_info *osmo_log_info; @@ -223,11 +222,6 @@ /*! Maximum number of logging filters */ #define LOG_MAX_FILTERS _LOG_FLT_COUNT -/*! Log context information, passed to filter */ -struct log_context { - void *ctx[LOG_MAX_CTX+1] OSMO_DEPRECATED_OUTSIDE("Accessing struct log_context members directly is deprecated"); -}; - /*! Compatibility with older libosmocore versions */ #define LOG_FILTER_ALL (1<<LOG_FLT_ALL) /*! Compatibility with older libosmocore versions */ @@ -237,6 +231,10 @@ /*! Indexes to indicate the object currently acted upon. * Array indexes for the global \a log_context array. */ +/*! Log context information, passed to filter */ +struct log_context; + +/*! structure representing a logging target */ struct log_target; /*! Log filter function */ @@ -297,106 +295,6 @@ LOG_FILENAME_POS_LINE_END, }; -/*! structure representing a logging target */ -#define OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE_LOG_TARGET \ - OSMO_DEPRECATED_OUTSIDE("Accessing struct log_target members directly is deprecated") -struct log_target { - struct llist_head entry; /*!< linked list */ - - /*! Internal data for filtering */ - int filter_map OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE_LOG_TARGET; - /*! Internal data for filtering */ - void *filter_data[LOG_MAX_FILTERS+1] OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE_LOG_TARGET; - - /*! logging categories */ - struct log_category *categories; - - /*! global log level */ - uint8_t loglevel; - /*! should color be used when printing log messages? */ - unsigned int use_color:1; - /*! should log messages be prefixed with a timestamp? */ - unsigned int print_timestamp:1; - /*! should log messages be prefixed with the logger Thread ID? */ - unsigned int print_tid:1; - /*! DEPRECATED: use print_filename2 instead. */ - unsigned int print_filename:1; - /*! should log messages be prefixed with a category name? */ - unsigned int print_category:1; - /*! should log messages be prefixed with an extended timestamp? */ - unsigned int print_ext_timestamp:1; - - /*! the type of this log taget */ - enum log_target_type type; - - union { - struct { - /* direct, blocking output via stdio */ - FILE *out; - const char *fname; - /* indirect output via write_queue and osmo_select_main() */ - struct osmo_wqueue *wqueue; - } tgt_file; - - struct { - int priority; - int facility; - } tgt_syslog; - - struct { - void *vty; - } tgt_vty; - - struct { - void *rb; - } tgt_rb; - - struct { - struct gsmtap_inst *gsmtap_inst; - const char *ident; - const char *hostname; - } tgt_gsmtap; - - struct { - bool raw; - } sd_journal; - }; - - /*! call-back function to be called when the logging framework - * wants to log a fully formatted string - * \param[in] target logging target - * \param[in] level log level of currnet message - * \param[in] string the string that is to be written to the log - */ - void (*output)(struct log_target *target, unsigned int level, - const char *string); - - /*! alternative call-back function to which the logging - * framework passes the unfortmatted input arguments, - * i.e. bypassing the internal string formatter - * \param[in] target logging target - * \param[in] subsys logging sub-system - * \param[in] level logging level - * \param[in] file soure code file name - * \param[in] line source code file line number - * \param[in] cont continuation of previous statement? - * \param[in] format format string - * \param[in] ap vararg list of printf arguments - */ - void (*raw_output)(struct log_target *target, int subsys, - unsigned int level, const char *file, int line, - int cont, const char *format, va_list ap); - - /* Should the log level be printed? */ - bool print_level; - /* Should we print the subsys in hex like '<000b>'? */ - bool print_category_hex; - /* Should we print the source file and line, and in which way? */ - enum log_filename_type print_filename2; - /* Where on a log line to put the source file info. */ - enum log_filename_pos print_filename_pos; -}; - /* use the above macros */ void logp2(int subsys, unsigned int level, const char *file, int line, int cont, const char *format, ...) @@ -406,7 +304,6 @@ void log_fini(void); int log_check_level(int subsys, unsigned int level); -/* context management */ void log_reset_context(void); int log_set_context(uint8_t ctx_nr, void *value); void *log_get_context(const struct log_context *ctx, uint8_t ctx_nr); diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 2e65660..6fc9b2a 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -4,7 +4,113 @@ * @{ * \file logging_internal.h */ +#include <stdint.h> + #include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/logging.h> + +/*! Log context information, passed to filter */ +struct log_context { + void *ctx[LOG_MAX_CTX+1] OSMO_DEPRECATED_OUTSIDE("Accessing struct log_context members directly is deprecated"); +}; + +struct log_target { + struct llist_head entry; /*!< linked list */ + + /*! Internal data for filtering */ + int filter_map; + /*! Internal data for filtering */ + void *filter_data[LOG_MAX_FILTERS+1]; + + /*! logging categories */ + struct log_category *categories; + + /*! global log level */ + uint8_t loglevel; + /*! should color be used when printing log messages? */ + unsigned int use_color:1; + /*! should log messages be prefixed with a timestamp? */ + unsigned int print_timestamp:1; + /*! should log messages be prefixed with the logger Thread ID? */ + unsigned int print_tid:1; + /*! DEPRECATED: use print_filename2 instead. */ + unsigned int print_filename:1; + /*! should log messages be prefixed with a category name? */ + unsigned int print_category:1; + /*! should log messages be prefixed with an extended timestamp? */ + unsigned int print_ext_timestamp:1; + + /*! the type of this log taget */ + enum log_target_type type; + + union { + struct { + /* direct, blocking output via stdio */ + FILE *out; + const char *fname; + /* indirect output via write_queue and osmo_select_main() */ + struct osmo_wqueue *wqueue; + } tgt_file; + + struct { + int priority; + int facility; + } tgt_syslog; + + struct { + void *vty; + } tgt_vty; + + struct { + void *rb; + } tgt_rb; + + struct { + struct gsmtap_inst *gsmtap_inst; + const char *ident; + const char *hostname; + } tgt_gsmtap; + + struct { + bool raw; + } sd_journal; + }; + + /*! call-back function to be called when the logging framework + * wants to log a fully formatted string + * \param[in] target logging target + * \param[in] level log level of currnet message + * \param[in] string the string that is to be written to the log + */ + void (*output)(struct log_target *target, unsigned int level, + const char *string); + + /*! alternative call-back function to which the logging + * framework passes the unfortmatted input arguments, + * i.e. bypassing the internal string formatter + * \param[in] target logging target + * \param[in] subsys logging sub-system + * \param[in] level logging level + * \param[in] file soure code file name + * \param[in] line source code file line number + * \param[in] cont continuation of previous statement? + * \param[in] format format string + * \param[in] ap vararg list of printf arguments + */ + void (*raw_output)(struct log_target *target, int subsys, + unsigned int level, const char *file, int line, + int cont, const char *format, va_list ap); + + /* Should the log level be printed? */ + bool print_level; + /* Should we print the subsys in hex like '<000b>'? */ + bool print_category_hex; + /* Should we print the source file and line, and in which way? */ + enum log_filename_type print_filename2; + /* Where on a log line to put the source file info. */ + enum log_filename_pos print_filename_pos; +}; extern void *tall_log_ctx; extern struct log_info *osmo_log_info; diff --git a/src/core/logging.c b/src/core/logging.c index ac10d00..748dd8f 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -62,7 +62,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> #include <osmocom/core/timer.h> #include <osmocom/core/thread.h> #include <osmocom/core/select.h> diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index 062efd9..dfde937 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -44,7 +44,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/gsmtap.h> #include <osmocom/core/gsmtap_util.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> #include <osmocom/core/timer.h> #include <osmocom/core/byteswap.h> #include <osmocom/core/thread.h> diff --git a/src/core/logging_syslog.c b/src/core/logging_syslog.c index eb84057..6659ac0 100644 --- a/src/core/logging_syslog.c +++ b/src/core/logging_syslog.c @@ -36,7 +36,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> static int logp2syslog_level(unsigned int level) { diff --git a/src/core/loggingrb.c b/src/core/loggingrb.c index 2bf7b66..f2f3e03 100644 --- a/src/core/loggingrb.c +++ b/src/core/loggingrb.c @@ -30,7 +30,7 @@ * \file loggingrb.c */ #include <osmocom/core/strrb.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> #include <osmocom/core/loggingrb.h> static void _rb_output(struct log_target *target, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iecbd07995ccb465a44be0debcc97458b2b240a0e Gerrit-Change-Number: 41891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: Avoid accessing struct log_target members directly
by fixeria 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/41880?usp=email ) Change subject: Avoid accessing struct log_target members directly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I81020f368c7e0e7b8dcd92917301bf3844157705 Gerrit-Change-Number: 41880 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: Detect struct in6_addr.s6_addr32 via AC_CHECK_MEMBER and use HAVE_IN6...
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: Timur Davydov, laforge. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41887?usp=email ) Change subject: Detect struct in6_addr.s6_addr32 via AC_CHECK_MEMBER and use HAVE_IN6_ADDR_S6_ADDR32 instead of __linux__. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29385fde0f1e6c6cc73cd1488befdef9040cc28e Gerrit-Change-Number: 41887 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: pySimLogger: user __name__ of the module when creating a new logger
by dexter 20 Jan '26

20 Jan '26

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): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I49a9beb98845f66247edd42ed548980c97a7151a Gerrit-Change-Number: 41890 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: transport/init: use PySimLogger to print messages
by dexter 20 Jan '26

20 Jan '26

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41812?usp=email ) Change subject: transport/init: use PySimLogger to print messages ...................................................................... Patch Set 2: (2 comments) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/41812/comment/ebd4111c_b3b280ea?usp=em… : PS1, Line 34: TRANSPORT > I am wondering why are you doing this instead of using `__name__`. […] I wasn't aware that there is a deeper concept behind the logger name. I have now put a patch before this one to align that. https://gerrit.osmocom.org/c/pysim/+/41812/comment/7681b717_b6df0209?usp=em… : PS1, Line 49: log.info > Please use lazy format string rendering here and below. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e2ec2b84f3b84dbd8a029ae9bb64b7a96ddbde3 Gerrit-Change-Number: 41812 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 13:07:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in pysim[master]: transport/init: use PySimLogger to print messages
by dexter 20 Jan '26

20 Jan '26

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41812?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: transport/init: use PySimLogger to print messages ...................................................................... transport/init: use PySimLogger to print messages The module still uses print to output information. Let's replace those print calls with the more modern PySimLogger method calls. Change-Id: I2e2ec2b84f3b84dbd8a029ae9bb64b7a96ddbde3 --- M pySim/transport/__init__.py 1 file changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/41812/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e2ec2b84f3b84dbd8a029ae9bb64b7a96ddbde3 Gerrit-Change-Number: 41812 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026