mirror of
https://github.com/fluencelabs/redis
synced 2025-03-30 22:31:03 +00:00
CONFIG REWRITE: no special handling or include and rename-command.
CONFIG REWRITE is now wiser and does not touch what it does not understand inside redis.conf.
This commit is contained in:
parent
7da423f79f
commit
b3632319a4
13
src/config.c
13
src/config.c
@ -1567,23 +1567,12 @@ void rewriteConfigReleaseState(struct rewriteConfigState *state) {
|
|||||||
* should be replaced by empty lines.
|
* should be replaced by empty lines.
|
||||||
*
|
*
|
||||||
* This function does just this, iterating all the option names and
|
* This function does just this, iterating all the option names and
|
||||||
* blanking all the lines still associated.
|
* blanking all the lines still associated. */
|
||||||
*
|
|
||||||
* Two options "include" and "rename-command" are special, they are
|
|
||||||
* just kept because struct RedisServer doesn't record them. Notice
|
|
||||||
* this also means the included config file isn't rewritten, you'd
|
|
||||||
* better put "include" at the beginning of Redis main config file
|
|
||||||
* so that runtime config change won't be canceled by conflicted
|
|
||||||
* options in the included config file. */
|
|
||||||
void rewriteConfigRemoveOrphaned(struct rewriteConfigState *state) {
|
void rewriteConfigRemoveOrphaned(struct rewriteConfigState *state) {
|
||||||
dictIterator *di = dictGetIterator(state->option_to_line);
|
dictIterator *di = dictGetIterator(state->option_to_line);
|
||||||
dictEntry *de;
|
dictEntry *de;
|
||||||
|
|
||||||
while((de = dictNext(di)) != NULL) {
|
while((de = dictNext(di)) != NULL) {
|
||||||
sds option = dictGetKey(de);
|
|
||||||
if (!strcmp(option, "include") || !strcmp(option, "rename-command"))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
list *l = dictGetVal(de);
|
list *l = dictGetVal(de);
|
||||||
sds option = dictGetKey(de);
|
sds option = dictGetKey(de);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user