1 files changed, 6 insertions, 27 deletions

diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c
index 1d6da5aa9..f9099d895 100644
--- a/src/rspamadm/lua_repl.c
+++ b/src/rspamadm/lua_repl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Vsevolod Stakhov
+ * Copyright 2025 Vsevolod Stakhov
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,8 @@
 #include "lua/lua_thread_pool.h"
 #include "message.h"
 #include "unix-std.h"
-#ifdef WITH_LUA_REPL
+
 #include "replxx.h"
-#endif
 #include "worker_util.h"
 #ifdef WITH_LUAJIT
 #include <luajit.h>
@@ -43,10 +42,7 @@ static int batch = -1;
 extern struct rspamd_async_session *rspamadm_session;
 
 static const char *default_history_file = ".rspamd_repl.hist";
-
-#ifdef WITH_LUA_REPL
 static Replxx *rx_instance = NULL;
-#endif
 
 #ifdef WITH_LUAJIT
 #define MAIN_PROMPT LUAJIT_VERSION "> "
@@ -232,7 +228,6 @@ rspamadm_exec_input(lua_State *L, const char *input)
 	int i, cbref;
 	int top = 0;
 	char outbuf[8192];
-	struct lua_logger_trace tr;
 
 	struct thread_entry *thread = lua_thread_pool_get_for_config(rspamd_main->cfg);
 	L = thread->lua_state;
@@ -272,9 +267,8 @@ rspamadm_exec_input(lua_State *L, const char *input)
 				rspamd_printf("local function: %d\n", cbref);
 			}
 			else {
-				memset(&tr, 0, sizeof(tr));
-				lua_logger_out_type(L, i, outbuf, sizeof(outbuf) - 1, &tr,
-									LUA_ESCAPE_UNPRINTABLE);
+				lua_logger_out(L, i, outbuf, sizeof(outbuf),
+							   LUA_ESCAPE_UNPRINTABLE);
 				rspamd_printf("%s\n", outbuf);
 			}
 		}
@@ -393,7 +387,6 @@ rspamadm_lua_message_handler(lua_State *L, int argc, char **argv)
 	gpointer map;
 	gsize len;
 	char outbuf[8192];
-	struct lua_logger_trace tr;
 
 	if (argv[1] == NULL) {
 		rspamd_printf("no callback is specified\n");
@@ -455,9 +448,8 @@ rspamadm_lua_message_handler(lua_State *L, int argc, char **argv)
 				rspamd_printf("lua callback for %s returned:\n", argv[i]);
 
 				for (j = old_top + 1; j <= lua_gettop(L); j++) {
-					memset(&tr, 0, sizeof(tr));
-					lua_logger_out_type(L, j, outbuf, sizeof(outbuf), &tr,
-										LUA_ESCAPE_UNPRINTABLE);
+					lua_logger_out(L, j, outbuf, sizeof(outbuf),
+								   LUA_ESCAPE_UNPRINTABLE);
 					rspamd_printf("%s\n", outbuf);
 				}
 			}
@@ -503,7 +495,6 @@ rspamadm_lua_try_dot_command(lua_State *L, const char *input)
 	return FALSE;
 }
 
-#ifdef WITH_LUA_REPL
 static int lex_ref_idx = -1;
 
 static void
@@ -599,20 +590,14 @@ lua_syntax_highlighter(const char *str, ReplxxColor *colours, int size, void *ud
 
 	lua_settop(L, 0);
 }
-#endif
 
 static void
 rspamadm_lua_run_repl(lua_State *L, bool is_batch)
 {
 	char *input = NULL;
-#ifdef WITH_LUA_REPL
 	gboolean is_multiline = FALSE;
 	GString *tb = NULL;
 	gsize i;
-#else
-	/* Always set is_batch */
-	is_batch = TRUE;
-#endif
 
 	for (;;) {
 		if (is_batch) {
@@ -644,7 +629,6 @@ rspamadm_lua_run_repl(lua_State *L, bool is_batch)
 			lua_settop(L, 0);
 		}
 		else {
-#ifdef WITH_LUA_REPL
 			replxx_set_highlighter_callback(rx_instance, lua_syntax_highlighter,
 											L);
 
@@ -706,7 +690,6 @@ rspamadm_lua_run_repl(lua_State *L, bool is_batch)
 				}
 			}
 		}
-#endif
 	}
 }
 
@@ -1009,16 +992,12 @@ rspamadm_lua(int argc, char **argv, const struct rspamadm_command *cmd)
 	}
 
 	if (!batch) {
-#ifdef WITH_LUA_REPL
 		rx_instance = replxx_init();
 		replxx_set_max_history_size(rx_instance, max_history);
 		replxx_history_load(rx_instance, histfile);
-#endif
 		rspamadm_lua_run_repl(L, false);
-#ifdef WITH_LUA_REPL
 		replxx_history_save(rx_instance, histfile);
 		replxx_end(rx_instance);
-#endif
 	}
 	else {
 		rspamadm_lua_run_repl(L, true);