X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/58732c23d53d6fc652668a516556ea182b0ed0f8..5574b53eae1743cca9eed5a9dd25bf418c974701:/redis.conf diff --git a/redis.conf b/redis.conf index 1138f2fb..6663a4ec 100644 --- 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: @@ -135,6 +135,21 @@ dir ./ # slave-serve-stale-data yes +# Slaves send PINGs to server in a predefined interval. It's possible to change +# this interval with the repl_ping_slave_period option. The default value is 10 +# seconds. +# +# 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. +# +# 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 ################################### # Require clients to issue AUTH <PASSWORD> before processing any other