caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set lua-time-limit default value at safe place.

Browse Source 
Otherwise, as it was, it will overwrite whatever the user set.

Close #3703.
This commit is contained in:
antirez 2017-04-11 16:56:00 +02:00
parent f47607af02
commit 4a850be4dc
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scripting.c
View File

@ -900,7 +900,6 @@ void scriptingInit(int setup) {
server.lua_caller = NULL; server.lua_caller = NULL;
server.lua_timedout = 0; server.lua_timedout = 0;
server.lua_always_replicate_commands = 0; /* Only DEBUG can change it.*/ server.lua_always_replicate_commands = 0; /* Only DEBUG can change it.*/
server.lua_time_limit = LUA_SCRIPT_TIME_LIMIT;
ldbInit(); ldbInit();
} }

1
src/server.c
View File

@ -1412,6 +1412,7 @@ void initServerConfig(void) {
server.lazyfree_lazy_expire = CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE; server.lazyfree_lazy_expire = CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE;
server.lazyfree_lazy_server_del = CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL; server.lazyfree_lazy_server_del = CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL;
server.always_show_logo = CONFIG_DEFAULT_ALWAYS_SHOW_LOGO; server.always_show_logo = CONFIG_DEFAULT_ALWAYS_SHOW_LOGO;
server.lua_time_limit = LUA_SCRIPT_TIME_LIMIT;
server.lruclock = getLRUClock(); server.lruclock = getLRUClock();
resetServerSaveParams(); resetServerSaveParams();