From d449e31586bde975b990c1d559da76e8ae112236 Mon Sep 17 00:00:00 2001
From: Thomas Kolb <cfr34k-git@tkolb.de>
Date: Sat, 20 Jul 2024 00:04:32 +0200
Subject: [PATCH] logger: show module name

---
 impl/src/layer1/rx.c | 8 +++++---
 impl/src/logger.c    | 8 ++++----
 impl/src/logger.h    | 8 ++++++--
 impl/src/main.c      | 2 ++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/impl/src/layer1/rx.c b/impl/src/layer1/rx.c
index 0f8b1cf..917d69c 100644
--- a/impl/src/layer1/rx.c
+++ b/impl/src/layer1/rx.c
@@ -3,6 +3,11 @@
 #include <assert.h>
 #include <math.h>
 
+//#define LOGGER_DISABLE_ALL // define this to disable all logging from this module
+
+#define LOGGER_MODULE_NAME "l1rx"
+#include "logger.h"
+
 #include "correlator.h"
 #include "preamble.h"
 #include "freq_est.h"
@@ -15,9 +20,6 @@
 
 #include "utils.h"
 
-//#define LOGGER_DISABLE_ALL // define this to disable all logging from this module
-#include "logger.h"
-
 #define SYMBOL_BUFFER_SIZE 16384
 
 #define HEADER_SIZE_BYTES 2
diff --git a/impl/src/logger.c b/impl/src/logger.c
index 776a4ec..db06984 100644
--- a/impl/src/logger.c
+++ b/impl/src/logger.c
@@ -117,7 +117,7 @@ void logger_debug_message(const char *prefix, const char *fmt, va_list ap)
 	free(p);
 }
 
-void logger_log(int level, const char *format, ...)
+void logger_log(int level, const char *module_name, const char *format, ...)
 {
 	va_list argptr;
 
@@ -133,7 +133,7 @@ void logger_log(int level, const char *format, ...)
 
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
-	strftime(timebuf, 32, "%Y-%M-%d %H:%M:%S.%%03d", localtime(&(tv.tv_sec)));
+	strftime(timebuf, 32, "%Y-%m-%d %H:%M:%S.%%03d", localtime(&(tv.tv_sec)));
 	snprintf(timebuf2, 32, timebuf, tv.tv_usec/1000);
 
 	if(level >= LVL_DUMP) {
@@ -175,9 +175,9 @@ void logger_log(int level, const char *format, ...)
 	}
 
 	if(logger_use_colors) {
-		sprintf(prefixbuf, "%s [%s%s%s]", timebuf2, prefixcolor, prefixtext, LOGGER_COLOR_NONE);
+		sprintf(prefixbuf, "%s [%s%s%s %-8s]", timebuf2, prefixcolor, prefixtext, LOGGER_COLOR_NONE, module_name);
 	} else {
-		sprintf(prefixbuf, "%s [%s]", timebuf2, prefixtext);
+		sprintf(prefixbuf, "%s [%s %-8s]", timebuf2, prefixtext, module_name);
 	}
 
 	va_start(argptr, format);
diff --git a/impl/src/logger.h b/impl/src/logger.h
index 455528f..66e1e54 100644
--- a/impl/src/logger.h
+++ b/impl/src/logger.h
@@ -41,10 +41,14 @@ void logger_shutdown(void);
 void logger_enable_colors(int enable);
 void logger_set_verbosity(int verbosity);
 
-void logger_log(int level, const char *format, ...);
+void logger_log(int level, const char *module_name, const char *format, ...);
+
+#ifndef LOGGER_MODULE_NAME
+	#define LOGGER_MODULE_NAME "undef"
+#endif
 
 #ifndef LOGGER_DISABLE_ALL
-	#define LOG(level, ...) logger_log(level, __VA_ARGS__)
+	#define LOG(level, ...) logger_log(level, LOGGER_MODULE_NAME, __VA_ARGS__)
 #else
 	#define LOG(level, ...) {}
 #endif
diff --git a/impl/src/main.c b/impl/src/main.c
index 9eda3e8..4ed38f6 100644
--- a/impl/src/main.c
+++ b/impl/src/main.c
@@ -13,6 +13,8 @@
 #include <errno.h>
 
 #include "utils.h"
+
+#define LOGGER_MODULE_NAME "main"
 #include "logger.h"
 #include "options.h"
 #include "jsonlogger.h"