Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
697d3abe
Commit
697d3abe
authored
Apr 11, 2017
by
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/scripting.c
View file @
697d3abe
...
@@ -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
();
}
}
...
...
src/server.c
View file @
697d3abe
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment