gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix FUNCTION KILL error message being displayed as SCRIPT KILL (#1171)

Browse Source 
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>
This commit is contained in:
Binbin 2024-10-15 23:32:42 +08:00 committed by Madelyn Olson
parent 3cddc0513b
commit 54aa97c67d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/script_lua.c
View File

@ -1558,7 +1558,13 @@ static void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
scriptRunCtx *rctx = luaGetFromRegistry(lua, REGISTRY_RUN_CTX_NAME); scriptRunCtx *rctx = luaGetFromRegistry(lua, REGISTRY_RUN_CTX_NAME);
serverAssert(rctx); /* Only supported inside script invocation */ serverAssert(rctx); /* Only supported inside script invocation */
if (scriptInterrupt(rctx) == SCRIPT_KILL) { 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 * Set the hook to invoke all the time so the user
@ -1567,7 +1573,7 @@ static void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
*/ */
lua_sethook(lua, luaMaskCountHook, LUA_MASKLINE, 0); lua_sethook(lua, luaMaskCountHook, LUA_MASKLINE, 0);
luaPushError(lua, "Script killed by user with SCRIPT KILL..."); luaPushError(lua, err);
luaError(lua); luaError(lua);
} }
} }

6
tests/unit/functions.tcl
View File

@ -246,6 +246,8 @@ start_server {tags {"scripting"}} {
r function kill r function kill
after 200 ; # Give some time to Lua to call the hook again... after 200 ; # Give some time to Lua to call the hook again...
assert_equal [r ping] "PONG" 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} { test {FUNCTION - test script kill not working on function} {
@ -261,6 +263,8 @@ start_server {tags {"scripting"}} {
r function kill r function kill
after 200 ; # Give some time to Lua to call the hook again... after 200 ; # Give some time to Lua to call the hook again...
assert_equal [r ping] "PONG" 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} { test {FUNCTION - test function kill not working on eval} {
@ -275,6 +279,8 @@ start_server {tags {"scripting"}} {
r script kill r script kill
after 200 ; # Give some time to Lua to call the hook again... after 200 ; # Give some time to Lua to call the hook again...
assert_equal [r ping] "PONG" assert_equal [r ping] "PONG"
assert_error {ERR Script killed by user with SCRIPT KILL*} {$rd read}
$rd close
} }
test {FUNCTION - test function flush} { test {FUNCTION - test function flush} {