fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16145 ) Change subject: logging: get rid of logging category DSUM ...................................................................... logging: get rid of logging category DSUM DSUM is somewhat similar to DMAIN, generic logging category used in other Osmocom projects. This category is rarely used in a few places, where the other categories could fit better. Remove it. Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce --- M include/osmo-bts/logging.h M src/common/bts.c M src/common/bts_trx.c M src/common/logging.c M src/common/main.c M src/osmo-bts-virtual/main.c 6 files changed, 9 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h index 852c383..e24fe74 100644 --- a/include/osmo-bts/logging.h +++ b/include/osmo-bts/logging.h @@ -20,7 +20,6 @@ DLOOP, DABIS, DRTP, - DSUM, }; extern const struct log_info bts_log_info; diff --git a/src/common/bts.c b/src/common/bts.c index 93fb400..4e49c45 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -429,7 +429,7 @@ { int i, j; - LOGP(DSUM, LOGL_INFO, "Main link established, sending NM Status.\n"); + LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n"); /* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS is DEPENDENCY */ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SW_ACT, NULL); @@ -652,7 +652,7 @@ struct gsm48_imm_ass_rej *imm_ass_cmd = msgb_l3(msg); if (bts->agch_queue.length > hard_limit) { - LOGP(DSUM, LOGL_ERROR, + LOGP(DRR, LOGL_ERROR, "AGCH: too many messages in queue, " "refusing message type %s, length = %d/%d\n", gsm48_rr_msg_name(((struct gsm48_imm_ass *)msgb_l3(msg))->msg_type), diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index ff5c618..fce1d02 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -222,7 +222,7 @@ { int rc; - LOGPTRX(trx, DSUM, LOGL_INFO, "RSL link up\n"); + LOGPTRX(trx, DRSL, LOGL_INFO, "RSL link up\n"); osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_RSL_UP, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_UP, NULL); diff --git a/src/common/logging.c b/src/common/logging.c index 50a5a1a..04025fc 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -119,12 +119,6 @@ .color = "\033[0;34m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DSUM] = { - .name = "DSUM", - .description = "DSUM", - .loglevel = LOGL_NOTICE, - .enabled = 1, - }, }; static int osmo_bts_filter_fn(const struct log_context *ctx, struct log_target *tgt) diff --git a/src/common/main.c b/src/common/main.c index b5ba21b..4ce00cc 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -303,6 +303,8 @@ bts_vty_init(tall_bts_ctx); e1inp_vty_init(); + logging_vty_add_deprecated_subsys(tall_bts_ctx, "sum"); + handle_options(argc, argv); fprintf(stderr, "((*))\n |\n / \\ OsmoBTS\n"); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index e5e44ed..34020e1 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -80,7 +80,7 @@ void bts_model_print_help() { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_handle_options(int argc, char **argv) @@ -126,18 +126,18 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -ENOTSUP; } void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int main(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce Gerrit-Change-Number: 16145 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged