Commit 0b14e441 authored by antirez's avatar antirez
Browse files

redis.conf updated to reflect the new scripting timeout semantics.

parent 5c639226
...@@ -339,8 +339,12 @@ auto-aof-rewrite-min-size 64mb ...@@ -339,8 +339,12 @@ auto-aof-rewrite-min-size 64mb
# still in execution after the maxium allowed time and will start to # still in execution after the maxium allowed time and will start to
# reply to queries with an error. # reply to queries with an error.
# #
# The SHUTDOWN command will be available to shutdown the server without # When a long running script exceed the maxium execution time only the
# violating the database consistency if the script entered an infinite loop. # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
# used to stop a script that did not yet called write commands. The second
# is the only way to shut down the server in the case a write commands was
# already issue by the script but the user don't want to wait for the natural
# termination of the script.
# #
# Set it to 0 or a negative value for unlimited execution without warnings. # Set it to 0 or a negative value for unlimited execution without warnings.
lua-time-limit 5000 lua-time-limit 5000
......
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