Updated to unstable

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 87d34eef02cf580930d913e2de4e38722092a2c5..6999dae3476cff578f8bed2004575ecfe73d037d 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
+
 #################################### DISK STORE ###############################
 
 # When disk store is active Redis works as an on-disk database, where memory