Merge branch 'unstable' of github.com:antirez/redis into unstable

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 1a051e4d3d82a4d504a42d6fe0b07e1124788ff1..9e9eac5f8f97808833d74ab7698bd5f90f77b18d 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -312,6 +312,13 @@ no-appendfsync-on-rewrite no
 auto-aof-rewrite-percentage 100
 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
+
 ################################## SLOW LOG ###################################
 
 # The Redis Slow Log is a system to log queries that exceeded a specified