diff options
| author | WuYunlong <xzsyeb@126.com> | 2020-09-03 15:31:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 10:31:18 +0300 |
| commit | 12f798dc18976839f3dfcb835433b6db63f8922f (patch) | |
| tree | 7d29b989ecebb38c7a7d27176941e4f2f5e32db8 /redis.conf | |
| parent | 9ef8d2f67155d6aa69b8344fc0b63e6dab8ce9f8 (diff) | |
| download | redis-12f798dc18976839f3dfcb835433b6db63f8922f.tar.gz | |
fix wrong comments in redis.conf, change default always-show-logo (#5695)
1. default value of always-show-logo was not consistent with the default in the code
2. comment about cluster-replica-no-failover is wrong since we can only do manually failover upon replicas
3. improve description about always-show-logo
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/redis.conf b/redis.conf index 35ee752e1..8f26a8f3e 100644 --- a/redis.conf +++ b/redis.conf @@ -285,12 +285,13 @@ logfile "" databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no ################################ SNAPSHOTTING ################################ # @@ -1322,7 +1323,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple |