From f94b9ee67b63c8ef467eef178c9f506424ba5125 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 25 Sep 2018 15:04:21 +0200 Subject: [PATCH] bankd: Initialize logging early. In case libosmocore wants to log e.g. a failure to bind the port, we must have initialized logging before that point. Change-Id: I86e805a66da6269748e6bd3164e5c0342e014f77 --- src/bankd.h | 4 ++++ src/bankd_main.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/bankd.h b/src/bankd.h index 3577d15..21d0ccb 100644 --- a/src/bankd.h +++ b/src/bankd.h @@ -14,6 +14,10 @@ #include "rspro_util.h" +enum { + DMAIN, +}; + struct bankd; struct bank_slot { diff --git a/src/bankd_main.c b/src/bankd_main.c index a2dccea..3545d68 100644 --- a/src/bankd_main.c +++ b/src/bankd_main.c @@ -14,6 +14,8 @@ #include #include +#include +#include #include #include @@ -32,8 +34,24 @@ static void *worker_main(void *arg); * bankd core / main thread ***********************************************************************/ +static const struct log_info_cat default_categories[] = { + [DMAIN] = { + .name = "DMAIN", + .loglevel = LOGL_DEBUG, + .enabled = 1, + }, +}; + +static const struct log_info log_info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + static void bankd_init(struct bankd *bankd) { + void *g_tall_ctx = talloc_named_const(NULL, 0, "global"); + osmo_init_logging2(g_tall_ctx, &log_info); + /* intialize members of 'bankd' */ INIT_LLIST_HEAD(&bankd->slot_mappings); pthread_rwlock_init(&bankd->slot_mappings_rwlock, NULL);