If a Lua script executes for more time than the max time specified in the configurati...

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 18a5dd036ae0f832a168d3691e41a26adf4b4f3d..71d6f70b00ef2069c28af1a6844e064644534714 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -316,9 +316,16 @@ auto-aof-rewrite-min-size 64mb
 ################################ LUA SCRIPTING  ###############################
 
 # Max execution time of a Lua script in milliseconds.
-# This prevents that a programming error generating an infinite loop will block
-# your server forever. Set it to 0 or a negative value for unlimited execution.
-lua-time-limit 60000
+#
+# If the maximum execution time is reached Redis will log that a script is
+# 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.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
 
 ################################ REDIS CLUSTER  ###############################
 #