From ccc8acec9d72b5d057095408589a189e51fdc3c1 Mon Sep 17 00:00:00 2001
From: Binbin <binloveplay1314@qq.com>
Date: Tue, 15 Oct 2024 23:32:42 +0800
Subject: [PATCH] Fix FUNCTION KILL error message being displayed as SCRIPT
 KILL (#1171)

The client that was killed by FUNCTION KILL received a reply of
SCRIPT KILL and the server log also showed SCRIPT KILL.

Signed-off-by: Binbin <binloveplay1314@qq.com>
---
 src/script_lua.c         | 10 ++++++++--
 tests/unit/functions.tcl |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/script_lua.c b/src/script_lua.c
index 2f54485b9..c1979abfb 100644
--- a/src/script_lua.c
+++ b/src/script_lua.c
@@ -1587,7 +1587,13 @@ static void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
     scriptRunCtx* rctx = luaGetFromRegistry(lua, REGISTRY_RUN_CTX_NAME);
     serverAssert(rctx); /* Only supported inside script invocation */
     if (scriptInterrupt(rctx) == SCRIPT_KILL) {
-        serverLog(LL_NOTICE,"Lua script killed by user with SCRIPT KILL.");
+        char *err = NULL;
+        if (rctx->flags & SCRIPT_EVAL_MODE) {
+            err = "Script killed by user with SCRIPT KILL.";
+        } else {
+            err = "Script killed by user with FUNCTION KILL.";
+        }
+        serverLog(LL_NOTICE, "%s", err);
 
         /*
          * Set the hook to invoke all the time so the user
@@ -1596,7 +1602,7 @@ static void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
          */
         lua_sethook(lua, luaMaskCountHook, LUA_MASKLINE, 0);
 
-        luaPushError(lua,"Script killed by user with SCRIPT KILL...");
+        luaPushError(lua, err);
         luaError(lua);
     }
 }
diff --git a/tests/unit/functions.tcl b/tests/unit/functions.tcl
index 9e8ec08f3..a531235f7 100644
--- a/tests/unit/functions.tcl
+++ b/tests/unit/functions.tcl
@@ -245,6 +245,8 @@ start_server {tags {"scripting"}} {
         r function kill
         after 200 ; # Give some time to Lua to call the hook again...
         assert_equal [r ping] "PONG"
+        assert_error {ERR Script killed by user with FUNCTION KILL*} {$rd read}
+        $rd close
     }
 
     test {FUNCTION - test script kill not working on function} {
@@ -260,6 +262,8 @@ start_server {tags {"scripting"}} {
         r function kill
         after 200 ; # Give some time to Lua to call the hook again...
         assert_equal [r ping] "PONG"
+        assert_error {ERR Script killed by user with FUNCTION KILL*} {$rd read}
+        $rd close
     }
 
     test {FUNCTION - test function kill not working on eval} {
@@ -274,6 +278,8 @@ start_server {tags {"scripting"}} {
         r script kill
         after 200 ; # Give some time to Lua to call the hook again...
         assert_equal [r ping] "PONG"
+        assert_error {ERR Script killed by user with SCRIPT KILL*} {$rd read}
+        $rd close
     }
 
     test {FUNCTION - test function flush} {