summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2013-12-19 15:55:25 +0100
committerantirez <antirez@gmail.com>2013-12-19 16:03:49 +0100
commitfb8a480f542b411ee14a998fd575e150dbc317ee (patch)
treefa864ea7c5cb3cbbfe34fa39304db1ab18d9c014
parentd62bbfda1654a5e0c0c9f489f30e7944dbc0c01c (diff)
downloadredis-fb8a480f542b411ee14a998fd575e150dbc317ee.tar.gz
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.
-rw-r--r--src/config.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/config.c b/src/config.c
index 83082c539..b4f094401 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1543,23 +1543,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);