-h is now alias for --help when running redis-server.

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index fdabda06d31bc1bfc8ba9b7c157a1bc54bf78fd7..8cea68aa5be3745294353d032d4b5e4cccaf839c 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)
 # 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:
 
 # Set server verbosity to 'debug'
 # it can be one of:


@@ -45,7 +45,7 @@ timeout 300
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)

-loglevel verbose
+loglevel notice

 
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard
 
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard


@@ -126,7 +126,7 @@ dir ./
 # is still in progress, the slave can act in two different ways:
 #
 # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
 # is still in progress, the slave can act in two different ways:
 #
 # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will

-#    still reply to client requests, possibly with out of data data, or the
+#    still reply to client requests, possibly with out of date data, or the

 #    data set may just be empty if this is the first synchronization.
 #
 # 2) if slave-serve-stale data is set to 'no' the slave will reply with
 #    data set may just be empty if this is the first synchronization.
 #
 # 2) if slave-serve-stale data is set to 'no' the slave will reply with


@@ -144,6 +144,10 @@ slave-serve-stale-data yes
 # 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.
 #
 # 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.
 #

+# 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 ###################################
 # 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.
 #
 # 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
 #
 # Set it to 0 or a negative value for unlimited execution without warnings.
 lua-time-limit 5000