X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/de32c37c06ee447d5d7d3505725c100da2c03c75..64f201c2aa3b2d6618b5aa11a19e2b96e0450e87:/redis.conf

diff --git a/redis.conf b/redis.conf
index 1551a13a..9e9eac5f 100644
--- 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
@@ -334,7 +341,7 @@ slowlog-log-slower-than 10000
 
 # There is no limit to this length. Just be aware that it will consume memory.
 # You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-log-len 1024
+slowlog-max-len 1024
 
 ############################### ADVANCED CONFIG ###############################