From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 27 Jul 2021 20:12:12 +0000 (+0200)
Subject: logging: use log_target() lua API
X-Git-Tag: v5.4.0~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=054262f07c6626cf182e50d78830d6025e2464c0;p=thirdparty%2Fknot-resolver.git

logging: use log_target() lua API

Refactor into more consistent lua API.
---

diff --git a/daemon/engine.c b/daemon/engine.c
index 116f6cc6a..1022691e3 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -75,6 +75,7 @@ static int l_help(lua_State *L)
 		"package_version()\n    return package version\n"
 		"user(name[, group])\n    change process user (and group)\n"
 		"log_level(level)\n	logging level (crit, err, warning, notice, info or debug)\n"
+		"log_target(target)\n	logging target (syslog, stderr, stdout)\n"
 		"option(opt[, new_val])\n    get/set server option\n"
 		"mode(strict|normal|permissive)\n    set resolver strictness level\n"
 		"reorder_RR([true|false])\n    set/get reordering of RRs within RRsets\n"
@@ -176,7 +177,7 @@ bad_call:
 	lua_error_p(L, "takes one string parameter or nothing");
 }
 
-static int l_set_log_target(lua_State *L)
+static int l_log_target(lua_State *L)
 {
 	const int params = lua_gettop(L);
 	if (params > 1)
@@ -201,9 +202,9 @@ static int l_set_log_target(lua_State *L)
 	// get
 	const char *t_str = NULL;
 	switch (kr_log_target) {
-		case LOG_TARGET_SYSLOG: t_str = "syslog"; break;
-		case LOG_TARGET_STDERR: t_str = "stderr"; break;
-		case LOG_TARGET_STDOUT: t_str = "stdout"; break;
+	case LOG_TARGET_SYSLOG: t_str = "syslog"; break;
+	case LOG_TARGET_STDERR: t_str = "stderr"; break;
+	case LOG_TARGET_STDOUT: t_str = "stdout"; break;
 	} // -Wswitch-enum
 	lua_pushstring(L, t_str);
 	return 1;
@@ -550,8 +551,8 @@ static int init_state(struct engine *engine)
 	lua_setglobal(engine->L, "verbose");
 	lua_pushcfunction(engine->L, l_log_level);
 	lua_setglobal(engine->L, "log_level");
-	lua_pushcfunction(engine->L, l_set_log_target);
-	lua_setglobal(engine->L, "set_log_target");
+	lua_pushcfunction(engine->L, l_log_target);
+	lua_setglobal(engine->L, "log_target");
 	lua_pushcfunction(engine->L, l_add_log_groups);
 	lua_setglobal(engine->L, "add_log_groups");
 	lua_pushcfunction(engine->L, l_del_log_groups);
diff --git a/daemon/lua/distro-preconfig.lua.in b/daemon/lua/distro-preconfig.lua.in
index 588c96603..df155c2c1 100644
--- a/daemon/lua/distro-preconfig.lua.in
+++ b/daemon/lua/distro-preconfig.lua.in
@@ -1,5 +1,5 @@
 -- SPDX-License-Identifier: GPL-3.0-or-later
-set_log_target('syslog') -- assume running as OS service
+log_target('syslog') -- assume running as OS service
 
 local ffi = require('ffi')
 local id = os.getenv('SYSTEMD_INSTANCE')
diff --git a/doc/config-logging-monitoring.rst b/doc/config-logging-monitoring.rst
index c600bd68f..111e1b922 100644
--- a/doc/config-logging-monitoring.rst
+++ b/doc/config-logging-monitoring.rst
@@ -42,9 +42,9 @@ set by :func:`log_level`.
      On busy systems vebose logging can produce several MB of logs per
      second and will slow down operation.
 
-.. py:function:: set_log_target(target)
+.. py:function:: log_target(target)
 
-  :param: String ``'syslog'``, ``'stderr'``, ``'stdout'``
+  :param: string ``'syslog'``, ``'stderr'``, ``'stdout'``
   :return: string Current logging target.
 
      Knot Resolver logs to standard error stream by default,