Fixed bug in getClientInfoString() that was not rendering the N (no flags) special...

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index e59f184df7cb06c2fdc642aac357a911dac2a579..df23414c20af883c77a0b4ff9b0e7068564d72ba 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -37,7 +37,7 @@ port 6379
 # unixsocketperm 755
 
 # Close the connection after a client is idle for N seconds (0 to disable)
-timeout 300
+timeout 0
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -139,12 +139,16 @@ slave-serve-stale-data yes
 # this interval with the repl_ping_slave_period option. The default value is 10
 # seconds.
 #
-# repl_ping_slave_period 10
+# repl-ping-slave-period 10
 
 # The following option sets a timeout for both Bulk transfer I/O timeout and
 # master data or ping response timeout. The default value is 60 seconds.
 #
-# repl_timeout 60
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
 
 ################################## SECURITY ###################################
 
@@ -335,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