diff options
| author | Yubao Liu <Yubao.Liu@gmail.com> | 2013-11-30 23:57:48 +0800 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2013-12-19 15:56:48 +0100 |
| commit | 7da423f79fee78b002b7e25f27cf1698c08974ed (patch) | |
| tree | b7ad913de188946100f43ff786d18449d5b668c5 /redis.conf | |
| parent | 3b9cf3ed3a7e7ba518f9410f9764bf89aac335ff (diff) | |
| download | redis-7da423f79fee78b002b7e25f27cf1698c08974ed.tar.gz | |
CONFIG REWRITE: don't throw some options on config rewrite
Those options will be thrown without this patch:
include, rename-command, min-slaves-to-write, min-slaves-max-lag,
appendfilename.
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/redis.conf b/redis.conf index 86ff1dac6..4c18120e1 100644 --- a/redis.conf +++ b/redis.conf @@ -12,6 +12,22 @@ # # units are case insensitive so 1GB 1Gb 1gB are all the same. +################################## INCLUDES ################################### + +# Include one or more other config files here. This is useful if you +# have a standard template that goes to all Redis server but also need +# to customize a few per-server settings. Include files can include +# other files, so use this wisely. +# +# Notice option "include" won't be rewritten by command "CONFIG REWRITE" +# from admin or Redis sentinel, you'd better put this option at the +# beginning of this file to avoid overwriting config change at runtime. +# +# include /path/to/local.conf +# include /path/to/other.conf + +################################ GENERAL ##################################### + # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. daemonize no @@ -88,7 +104,7 @@ logfile "" # dbid is a number between 0 and 'databases'-1 databases 16 -################################ SNAPSHOTTING ################################# +################################ SNAPSHOTTING ################################ # # Save the DB on disk: # @@ -711,12 +727,3 @@ hz 10 # big latency spikes. aof-rewrite-incremental-fsync yes -################################## INCLUDES ################################### - -# Include one or more other config files here. This is useful if you -# have a standard template that goes to all Redis server but also need -# to customize a few per-server settings. Include files can include -# other files, so use this wisely. -# -# include /path/to/local.conf -# include /path/to/other.conf |