node cluster configuration file configurable via redis.conf

diff --git a/src/cluster.c b/src/cluster.c
index 27630561c4fd52f222d1576f04a69a884b51800f..6d117acadf306ee548eee7c3abbe9cdcf5aef6de 100644 (file)
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -13,6 +13,7 @@ int clusterNodeGetSlotBit(clusterNode *n, int slot);
 sds clusterGenNodesDescription(void);
 clusterNode *clusterLookupNode(char *name);
 int clusterNodeAddSlave(clusterNode *master, clusterNode *slave);
 sds clusterGenNodesDescription(void);
 clusterNode *clusterLookupNode(char *name);
 int clusterNodeAddSlave(clusterNode *master, clusterNode *slave);

+int clusterAddSlot(clusterNode *n, int slot);

 
 /* -----------------------------------------------------------------------------
  * Initialization
 
 /* -----------------------------------------------------------------------------
  * Initialization

diff --git a/src/config.c b/src/config.c
index e40fdedad16bb65ec6e864322ab84bed431fab2d..48f90349daf4faa7d96c6ee52f7e83334036b87e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -289,6 +289,9 @@ void loadServerConfig(char *filename) {
             if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
             if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }

+        } else if (!strcasecmp(argv[0],"cluster-config-file") && argc == 2) {
+            zfree(server.cluster.configfile);
+            server.cluster.configfile = zstrdup(argv[1]);

         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }