fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-22 17:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Lua max exec time fixes: redisLog() to log the event moved before the lua_error() call that does a long jump so never returns. Aesthetic fixes in error message.

Browse Source
This commit is contained in:
antirez 2011-05-06 17:30:54 +02:00
parent bcc72bc381
commit 87c219243c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripting.c
View File

@ -206,9 +206,9 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
if (server.lua_time_limit <= 0) return; if (server.lua_time_limit <= 0) return;
elapsed = (ustime()/1000) - server.lua_time_start; elapsed = (ustime()/1000) - server.lua_time_start;
if (elapsed >= server.lua_time_limit) { if (elapsed >= server.lua_time_limit) {
lua_pushstring(lua,"Script aborted for max execution time..."); redisLog(REDIS_NOTICE,"Lua script aborted for max execution time after %lld milliseconds of running time.",elapsed);
lua_pushstring(lua,"Script aborted for max execution time.");
lua_error(lua); lua_error(lua);
redisLog(REDIS_NOTICE,"Lua script aborted for max execution time after %lld milliseconds of running time",elapsed);
} }
} }