Commit 697d3abe authored by antirez's avatar antirez
Browse files

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

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

Close #3703.
parent c9c04b11
...@@ -900,7 +900,6 @@ void scriptingInit(int setup) { ...@@ -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();
} }
......
...@@ -1533,6 +1533,7 @@ void initServerConfig(void) { ...@@ -1533,6 +1533,7 @@ void initServerConfig(void) {
server.migrate_cached_sockets = dictCreate(&migrateCacheDictType,NULL); server.migrate_cached_sockets = dictCreate(&migrateCacheDictType,NULL);
server.next_client_id = 1; /* Client IDs, start from 1 .*/ server.next_client_id = 1; /* Client IDs, start from 1 .*/
server.loading_process_events_interval_bytes = (1024*1024*2); server.loading_process_events_interval_bytes = (1024*1024*2);
server.lua_time_limit = LUA_SCRIPT_TIME_LIMIT;
server.lruclock = getLRUClock(); server.lruclock = getLRUClock();
resetServerSaveParams(); resetServerSaveParams();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment