Skip to content

Commit

Permalink
redis.conf updated to reflect the new scripting timeout semantics.
Browse files Browse the repository at this point in the history
  • Loading branch information
antirez committed Nov 18, 2011
1 parent 5c63922 commit 0b14e44
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions redis.conf
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,12 @@ auto-aof-rewrite-min-size 64mb
# still in execution after the maxium allowed time and will start to
# reply to queries with an error.
#
# The SHUTDOWN command will be available to shutdown the server without
# violating the database consistency if the script entered an infinite loop.
# When a long running script exceed the maxium execution time only the
# 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.
lua-time-limit 5000
Expand Down

0 comments on commit 0b14e44

Please sign in to comment.