Commit 1793752d authored by antirez's avatar antirez
Browse files

node cluster configuration file configurable via redis.conf

parent 2bc52b2c
...@@ -13,6 +13,7 @@ int clusterNodeGetSlotBit(clusterNode *n, int slot); ...@@ -13,6 +13,7 @@ int clusterNodeGetSlotBit(clusterNode *n, int slot);
sds clusterGenNodesDescription(void); sds clusterGenNodesDescription(void);
clusterNode *clusterLookupNode(char *name); clusterNode *clusterLookupNode(char *name);
int clusterNodeAddSlave(clusterNode *master, clusterNode *slave); int clusterNodeAddSlave(clusterNode *master, clusterNode *slave);
int clusterAddSlot(clusterNode *n, int slot);
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Initialization * Initialization
......
...@@ -289,6 +289,9 @@ void loadServerConfig(char *filename) { ...@@ -289,6 +289,9 @@ void loadServerConfig(char *filename) {
if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) { if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) {
err = "argument must be 'yes' or 'no'"; goto loaderr; 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 { } else {
err = "Bad directive or wrong number of arguments"; goto loaderr; err = "Bad directive or wrong number of arguments"; goto loaderr;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment