Change in osmocom-bb[master]: layer23: use osmo_stderr_target in misc apps

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30805 ) Change subject: layer23: use osmo_stderr_target in misc apps ...................................................................... layer23: use osmo_stderr_target in misc apps Change-Id: I56770f04fa3c440e6ccabe6f6fccfe171d41d751 --- M src/host/layer23/src/common/main.c M src/host/layer23/src/misc/app_cell_log.c 2 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/30805/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index f3d1ad1..709eead 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -29,6 +29,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/core/application.h> #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/gsmtap.h> #include <osmocom/core/utils.h> @@ -43,8 +44,6 @@ #include <fcntl.h> #include <signal.h> -struct log_target *stderr_target; - void *l23_ctx = NULL; static char *layer2_socket_path = "/tmp/osmocom_l2"; @@ -184,7 +183,7 @@ vty_port = atoi(optarg); break; case 'd': - log_parse_category_mask(stderr_target, optarg); + log_parse_category_mask(osmo_stderr_target, optarg); break; default: if (app && app->cfg_handle_opt) @@ -226,13 +225,11 @@ int rc; INIT_LLIST_HEAD(&ms_list); - log_init(&log_info, NULL); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); l23_ctx = talloc_named_const(NULL, 1, "layer2 context"); + osmo_init_logging2(l23_ctx, &log_info); + ms = talloc_zero(l23_ctx, struct osmocom_ms); if (!ms) { fprintf(stderr, "Failed to allocate MS\n"); diff --git a/src/host/layer23/src/misc/app_cell_log.c b/src/host/layer23/src/misc/app_cell_log.c index 069e7d1..abc472d 100644 --- a/src/host/layer23/src/misc/app_cell_log.c +++ b/src/host/layer23/src/misc/app_cell_log.c @@ -28,12 +28,12 @@ #include <osmocom/bb/common/gps.h> #include <osmocom/bb/misc/cell_log.h> +#include <osmocom/core/application.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <l1ctl_proto.h> -extern struct log_target *stderr_target; extern void *l23_ctx; extern uint16_t basic_band_range[][2]; @@ -66,9 +66,9 @@ srand(time(NULL)); -// log_parse_category_mask(stderr_target, "DL1C:DRSL:DRR:DGPS:DSUM"); - log_parse_category_mask(stderr_target, "DSUM"); - log_set_log_level(stderr_target, LOGL_INFO); +// log_parse_category_mask(osmo_stderr_target, "DL1C:DRSL:DRR:DGPS:DSUM"); + log_parse_category_mask(osmo_stderr_target, "DSUM"); + log_set_log_level(osmo_stderr_target, LOGL_INFO); l23_app_work = _scan_work; l23_app_exit = _scan_exit; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56770f04fa3c440e6ccabe6f6fccfe171d41d751 Gerrit-Change-Number: 30805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-MessageType: newchange