From 73bbd54cdb0388ebf7025053d638d0a34fcf0821 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Wed, 8 Dec 2021 20:39:55 +0100
Subject: [PATCH] logging: Print category + level, disable category-hex

Change-Id: I9ae27b78b965d173146583b030fd93e2d70b845e
---
 src/bankd/bankd_main.c          | 5 +++++
 src/client/remsim_client_main.c | 6 ++++++
 src/server/remsim_server.c      | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c
index a9c7b71..3842b0c 100644
--- a/src/bankd/bankd_main.c
+++ b/src/bankd/bankd_main.c
@@ -39,6 +39,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/core/application.h>
+#include <osmocom/core/fsm.h>
 
 #include <osmocom/gsm/ipa.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
@@ -75,6 +76,10 @@ static void bankd_init(struct bankd *bankd)
 {
 	g_tall_ctx = talloc_named_const(NULL, 0, "global");
 	osmo_init_logging2(g_tall_ctx, &log_info);
+	log_set_print_level(osmo_stderr_target, 1);
+	log_set_print_category(osmo_stderr_target, 1);
+	log_set_print_category_hex(osmo_stderr_target, 0);
+	osmo_fsm_log_addr(0);
 
 	asn_debug = 0;
 
diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c
index bbc2990..f064960 100644
--- a/src/client/remsim_client_main.c
+++ b/src/client/remsim_client_main.c
@@ -6,6 +6,8 @@
 #include <getopt.h>
 
 #include <osmocom/core/msgb.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/fsm.h>
 #include <osmocom/core/application.h>
 
 #include "client.h"
@@ -169,6 +171,10 @@ int main(int argc, char **argv)
 	msgb_talloc_ctx_init(g_tall_ctx, 0);
 
 	osmo_init_logging2(g_tall_ctx, &log_info);
+	log_set_print_level(osmo_stderr_target, 1);
+	log_set_print_category(osmo_stderr_target, 1);
+	log_set_print_category_hex(osmo_stderr_target, 0);
+	osmo_fsm_log_addr(0);
 
 	cfg = client_config_init(g_tall_ctx);
 	OSMO_ASSERT(cfg);
diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c
index 7fc2926..49107b9 100644
--- a/src/server/remsim_server.c
+++ b/src/server/remsim_server.c
@@ -8,6 +8,8 @@
 
 #include <osmocom/core/utils.h>
 #include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/fsm.h>
 #include <osmocom/core/application.h>
 #include <osmocom/core/select.h>
 
@@ -87,6 +89,10 @@ int main(int argc, char **argv)
 	msgb_talloc_ctx_init(g_tall_ctx, 0);
 
 	osmo_init_logging2(g_tall_ctx, &log_info);
+	log_set_print_level(osmo_stderr_target, 1);
+	log_set_print_category(osmo_stderr_target, 1);
+	log_set_print_category_hex(osmo_stderr_target, 0);
+	osmo_fsm_log_addr(0);
 
 	handle_options(argc, argv);