Change in osmocom-bb[master]: mobile: use osmo_init_logging2 with proper talloc context

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10021 )

Change subject: mobile: use osmo_init_logging2 with proper talloc context
......................................................................

mobile: use osmo_init_logging2 with proper talloc context

Change-Id: I231ac9987ff3c13fafcd272b7d9aae3938ab5972
---
M src/host/layer23/src/mobile/main.c
1 file changed, 5 insertions(+), 13 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c
index 5a28be8..115ac41 100644
--- a/src/host/layer23/src/mobile/main.c
+++ b/src/host/layer23/src/mobile/main.c
@@ -46,8 +46,6 @@
 #include <time.h>
 #include <libgen.h>
 
-struct log_target *stderr_target;
-
 void *l23_ctx = NULL;
 struct llist_head ms_list;
 static char *gsmtap_ip = 0;
@@ -55,7 +53,6 @@
 struct gsmtap_inst *gsmtap_inst = NULL;
 static char *vty_ip = "127.0.0.1";
 unsigned short vty_port = 4247;
-int debug_set = 0;
 char *config_dir = NULL;
 int use_mncc_sock = 0;
 int daemonize = 0;
@@ -142,8 +139,7 @@
 			vty_port = atoi(optarg);
 			break;
 		case 'd':
-			log_parse_category_mask(stderr_target, optarg);
-			debug_set = 1;
+			log_parse_category_mask(osmo_stderr_target, optarg);
 			break;
 		case 'D':
 			daemonize = 1;
@@ -214,20 +210,15 @@
 	srand(time(NULL));
 
 	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");
 	/* TODO: measure and choose a proper pool size */
 	msgb_talloc_ctx_init(l23_ctx, 0);
 
-	handle_options(argc, argv);
+	/* Init default stderr logging */
+	osmo_init_logging2(l23_ctx, &log_info);
 
-	if (!debug_set)
-		log_parse_category_mask(stderr_target, debug_default);
-	log_set_log_level(stderr_target, LOGL_DEBUG);
+	handle_options(argc, argv);
 
 	if (gsmtap_ip) {
 		gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);
@@ -287,6 +278,7 @@
 	}
 
 	l23_app_exit();
+	log_fini();
 
 	talloc_free(config_file);
 	talloc_free(config_dir);

-- 
To view, visit https://gerrit.osmocom.org/10021
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I231ac9987ff3c13fafcd272b7d9aae3938ab5972
Gerrit-Change-Number: 10021
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180721/fc0a3c5a/attachment.htm>