From 0b14e44118bf80e2e724081fcf2f3071788068d5 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 18 Nov 2011 16:29:22 +0100 Subject: [PATCH] redis.conf updated to reflect the new scripting timeout semantics. --- redis.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/redis.conf b/redis.conf index 6663a4ec..df23414c 100644 --- a/redis.conf +++ b/redis.conf @@ -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