phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

mobile: use osmo_init_logging2 with proper talloc context 

Change-Id: I231ac9987ff3c13fafcd272b7d9aae3938ab5972
This commit is contained in:
Vadim Yanitskiy 2018-07-17 05:14:56 +07:00
parent a0eef8d2e8
commit d3394d13f2
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/host/layer23/src/mobile/main.c
View File

@ -46,8 +46,6 @@
#include <time.h> #include <time.h>
#include <libgen.h> #include <libgen.h>
struct log_target *stderr_target;
void *l23_ctx = NULL; void *l23_ctx = NULL;
struct llist_head ms_list; struct llist_head ms_list;
static char *gsmtap_ip = 0; static char *gsmtap_ip = 0;
@ -55,7 +53,6 @@ static const char *custom_cfg_file = NULL;
struct gsmtap_inst *gsmtap_inst = NULL; struct gsmtap_inst *gsmtap_inst = NULL;
static char *vty_ip = "127.0.0.1"; static char *vty_ip = "127.0.0.1";
unsigned short vty_port = 4247; unsigned short vty_port = 4247;
int debug_set = 0;
char *config_dir = NULL; char *config_dir = NULL;
int use_mncc_sock = 0; int use_mncc_sock = 0;
int daemonize = 0; int daemonize = 0;
@ -142,8 +139,7 @@ static void handle_options(int argc, char **argv)
vty_port = atoi(optarg); vty_port = atoi(optarg);
break; break;
case 'd': case 'd':
log_parse_category_mask(stderr_target, optarg); log_parse_category_mask(osmo_stderr_target, optarg);
debug_set = 1;
break; break;
case 'D': case 'D':
daemonize = 1; daemonize = 1;
@ -214,20 +210,15 @@ int main(int argc, char **argv)
srand(time(NULL)); srand(time(NULL));
INIT_LLIST_HEAD(&ms_list); 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"); l23_ctx = talloc_named_const(NULL, 1, "layer2 context");
/* TODO: measure and choose a proper pool size */ /* TODO: measure and choose a proper pool size */
msgb_talloc_ctx_init(l23_ctx, 0); 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) handle_options(argc, argv);
log_parse_category_mask(stderr_target, debug_default);
log_set_log_level(stderr_target, LOGL_DEBUG);
if (gsmtap_ip) { if (gsmtap_ip) {
gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);
@ -287,6 +278,7 @@ int main(int argc, char **argv)
} }
l23_app_exit(); l23_app_exit();
log_fini();
talloc_free(config_file); talloc_free(config_file);
talloc_free(config_dir); talloc_free(config_dir);