From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 7 Jul 2021 13:45:26 +0000 (+0200)
Subject: logging: ensure get/set_log_level behaves consistently
X-Git-Tag: v5.4.0~2^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=183aff35660f018b6854aa5595d3559f10a6ec26;p=thirdparty%2Fknot-resolver.git

logging: ensure get/set_log_level behaves consistently

Ensure both these functions return string that represents the log level.

Also avoid using printf - it'd probably break API when using map().
---

diff --git a/daemon/engine.c b/daemon/engine.c
index cc684c66f..2a5d7ff4b 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -161,16 +161,16 @@ static int l_set_log_level(lua_State *L)
 	}
 
 	log_level_t lvl = kr_log_name2level(lua_tostring(L, 1));
+	lvl = kr_log_level_set(lvl);
 
-	lua_pushinteger(L, kr_log_level_set(lvl));
+	lua_pushstring(L, kr_log_level2name(lvl));
 	return 1;
 }
 
 static int l_get_log_level(lua_State *L)
 {
-	printf("%s\n", kr_log_level2name(kr_log_level_get()));
-
-	return 0;
+	lua_pushstring(L, kr_log_level2name(kr_log_level_get()));
+	return 1;
 }
 
 static int handle_log_groups(lua_State *L, void (*action)(log_groups_t grp))
diff --git a/lib/log.c b/lib/log.c
index 3d8482d55..aaca7ccd4 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -182,8 +182,10 @@ log_groups_t kr_log_name2grp(const char *name)
 
 int kr_log_level_set(log_level_t level)
 {
-	if (level < LOG_CRIT || level > LOG_DEBUG)
+	if (level < LOG_CRIT || level > LOG_DEBUG) {
+		kr_log_warning(SYSTEM, "invalid log level\n");
 		return kr_log_level;
+	}
 
 	kr_log_level = level;
 	setlogmask(LOG_UPTO(kr_log_level));