From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 8 Jul 2021 01:37:43 +0000 (+0200)
Subject: logging: print group name padded to 6 characters
X-Git-Tag: v5.4.0~2^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bee32ed7feffd7e0f540d63e4f2a7efe44a444f;p=thirdparty%2Fknot-resolver.git

logging: print group name padded to 6 characters

Add space padding when printing the group name to allow usage of
regular group names in lua code (e.g. "io" instead of "io    ").
---

diff --git a/daemon/lua/sandbox.lua.in b/daemon/lua/sandbox.lua.in
index 5c4fcc513..01ae885f1 100644
--- a/daemon/lua/sandbox.lua.in
+++ b/daemon/lua/sandbox.lua.in
@@ -32,7 +32,7 @@ local function curr_line() return debug.getinfo(4,'l').currentline end
 
 local function log_fmt(grp, level, fmt, ...)
 	ffi.C.kr_log_fmt(grp, level, 'CODE_FILE='..curr_file(), 'CODE_LINE='..curr_line(), '',
-			'[%s] ' .. fmt .. '\n', ffi.C.kr_log_grp2name(grp), ...)
+			'[%-6s] ' .. fmt .. '\n', ffi.C.kr_log_grp2name(grp), ...)
 end
 
 function log_req(req, qry_uid, indent, grp, fmt, ...)
diff --git a/lib/log.c b/lib/log.c
index c1cc41568..81eaeceb0 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -249,7 +249,7 @@ static void kr_vlog_req(
 	if (kr_log_rtrace_enabled(req))
 		req->trace_log(req, msg);
 	else
-		kr_log_fmt(group, LOG_DEBUG, SD_JOURNAL_METADATA, "[%s]%s", tag, msg);
+		kr_log_fmt(group, LOG_DEBUG, SD_JOURNAL_METADATA, "[%-6s]%s", tag, msg);
 
 	mp_delete(mp);
 }
diff --git a/lib/log.h b/lib/log.h
index e5ebe600e..c3fb5db59 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -73,20 +73,20 @@ enum kr_log_groups_type {
 
 
 #define LOG_GRP_SYSTEM_TAG		"system"
-#define LOG_GRP_CACHE_TAG		"cache "
-#define LOG_GRP_IO_TAG			"io    "
-#define LOG_GRP_NETWORK_TAG		"net   "
-#define LOG_GRP_TA_TAG			"ta    "
-#define LOG_GRP_TLS_TAG			"tls   "
+#define LOG_GRP_CACHE_TAG		"cache"
+#define LOG_GRP_IO_TAG			"io"
+#define LOG_GRP_NETWORK_TAG		"net"
+#define LOG_GRP_TA_TAG			"ta"
+#define LOG_GRP_TLS_TAG			"tls"
 #define LOG_GRP_GNUTLS_TAG		"gnutls"
 #define LOG_GRP_TLSCLIENT_TAG		"tls_cl"
-#define LOG_GRP_XDP_TAG			"xdp   "
+#define LOG_GRP_XDP_TAG			"xdp"
 #define LOG_GRP_ZIMPORT_TAG		"zimprt"
 #define LOG_GRP_ZSCANNER_TAG		"zscann"
-#define LOG_GRP_DOH_TAG			"doh   "
+#define LOG_GRP_DOH_TAG			"doh"
 #define LOG_GRP_DNSSEC_TAG		"dnssec"
-#define LOG_GRP_HINT_TAG		"hint  "
-#define LOG_GRP_PLAN_TAG		"plan  "
+#define LOG_GRP_HINT_TAG		"hint"
+#define LOG_GRP_PLAN_TAG		"plan"
 #define LOG_GRP_ITERATOR_TAG		"iterat"
 #define LOG_GRP_VALIDATOR_TAG		"valdtr"
 #define LOG_GRP_RESOLVER_TAG		"resolv"
@@ -99,8 +99,8 @@ enum kr_log_groups_type {
 #define LOG_GRP_POLICY_TAG		"policy"
 #define LOG_GRP_TASENTINEL_TAG		"tasent"
 #define LOG_GRP_TASIGNALING_TAG		"tasign"
-#define LOG_GRP_TAUPDATE_TAG		"taupd "
-#define LOG_GRP_DAF_TAG			"daf   "
+#define LOG_GRP_TAUPDATE_TAG		"taupd"
+#define LOG_GRP_DAF_TAG			"daf"
 #define LOG_GRP_DETECTTIMEJUMP_TAG	"timejm"
 #define LOG_GRP_DETECTTIMESKEW_TAG	"timesk"
 #define LOG_GRP_GRAPHITE_TAG		"graphi"
@@ -108,9 +108,9 @@ enum kr_log_groups_type {
 #define LOG_GRP_PRIMING_TAG		"primin"
 #define LOG_GRP_SRVSTALE_TAG		"srvstl"
 #define LOG_GRP_WATCHDOG_TAG		"wtchdg"
-#define LOG_GRP_NSID_TAG		"nsid  "
+#define LOG_GRP_NSID_TAG		"nsid"
 #define LOG_GRP_DNSTAP_TAG		"dnstap"
-#define LOG_GRP_TESTS_TAG		"tests "
+#define LOG_GRP_TESTS_TAG		"tests"
 
 KR_EXPORT
 extern log_groups_t kr_log_groups;
@@ -149,26 +149,26 @@ void kr_log_init(log_level_t level, log_target_t target);
 
 #define kr_log_debug(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_DEBUG, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 #define kr_log_info(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_INFO, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 #define kr_log_notice(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_NOTICE, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 #define kr_log_warning(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_WARNING, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 #define kr_log_error(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_ERR, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 #define kr_log_fatal(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_CRIT, SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] " fmt, ## __VA_ARGS__)
+			"[%-6s] " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 
 #define kr_log_deprecate(grp, fmt, ...) \
 	kr_log_fmt(LOG_GRP_ ## grp, LOG_WARNING,SD_JOURNAL_METADATA, \
-			"[" LOG_GRP_ ## grp ## _TAG "] deprecation WARNING: " fmt, ## __VA_ARGS__)
+			"[%-6s] deprecation WARNING: " fmt, LOG_GRP_ ## grp ## _TAG, ## __VA_ARGS__)
 
 #define KR_LOG_LEVEL_IS(exp) ((kr_log_level >= (exp)) ? true : false)