From b3632319a47321393e36c627f6c59e08773c07ff Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 19 Dec 2013 15:55:25 +0100
Subject: [PATCH] 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.
---
src/config.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/config.c b/src/config.c
index c5baab6a..3bd1d859 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1567,23 +1567,12 @@ void rewriteConfigReleaseState(struct rewriteConfigState *state) {
* should be replaced by empty lines.
*
* This function does just this, iterating all the option names and
- * 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. */
+ * blanking all the lines still associated. */
void rewriteConfigRemoveOrphaned(struct rewriteConfigState *state) {
dictIterator *di = dictGetIterator(state->option_to_line);
dictEntry *de;
while((de = dictNext(di)) != NULL) {
- sds option = dictGetKey(de);
- if (!strcmp(option, "include") || !strcmp(option, "rename-command"))
- continue;
-
list *l = dictGetVal(de);
sds option = dictGetKey(de);