fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-13 12:46:03 +00:00
Code Issues Projects Releases Wiki Activity

Use listenToPort() in cluster.c as well.

Browse Source
This commit is contained in:
antirez 2013-08-22 14:05:07 +02:00
parent 4f310e05c0
commit 81a6a9639a
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cluster.c
View File

@ -226,7 +226,7 @@ void clusterSaveConfigOrDie(void) {
} }
void clusterInit(void) { void clusterInit(void) {
int saveconf = 0, j; int saveconf = 0;
server.cluster = zmalloc(sizeof(clusterState)); server.cluster = zmalloc(sizeof(clusterState));
server.cluster->myself = NULL; server.cluster->myself = NULL;
@ -252,25 +252,16 @@ void clusterInit(void) {
saveconf = 1; saveconf = 1;
} }
if (saveconf) clusterSaveConfigOrDie(); if (saveconf) clusterSaveConfigOrDie();
/* We need a listening TCP port for our cluster messaging needs */
/* We need a listening TCP port for our cluster messaging needs. */
server.cfd_count = 0; server.cfd_count = 0;
if (server.bindaddr_count == 0) server.bindaddr[0] = NULL; if (listenToPort(server.port+REDIS_CLUSTER_PORT_INCR,
for (j = 0; j < server.bindaddr_count || j == 0; j++) { server.cfd,&server.cfd_count) == REDIS_ERR)
server.cfd[j] = anetTcpServer( {
server.neterr, server.port+REDIS_CLUSTER_PORT_INCR,
server.bindaddr[j]);
if (server.cfd[j] == -1) {
redisLog(REDIS_WARNING,
"Opening cluster listening TCP socket %s:%d: %s",
server.bindaddr[j] ? server.bindaddr[j] : "*",
server.port+REDIS_CLUSTER_PORT_INCR,
server.neterr);
exit(1); exit(1);
} }
if (aeCreateFileEvent(server.el, server.cfd[j], AE_READABLE,
clusterAcceptHandler, NULL) == AE_ERR) redisPanic("Unrecoverable error creating Redis Cluster file event."); /* The slots -> keys map is a sorted set. Init it. */
server.cfd_count++;
}
server.cluster->slots_to_keys = zslCreate(); server.cluster->slots_to_keys = zslCreate();
} }

1
src/redis.h
View File

@ -1096,6 +1096,7 @@ int getClientLimitClassByName(char *name);
char *getClientLimitClassName(int class); char *getClientLimitClassName(int class);
void flushSlavesOutputBuffers(void); void flushSlavesOutputBuffers(void);
void disconnectSlaves(void); void disconnectSlaves(void);
int listenToPort(int port, int *fds, int *count);
#ifdef __GNUC__ #ifdef __GNUC__
void addReplyErrorFormat(redisClient *c, const char *fmt, ...) void addReplyErrorFormat(redisClient *c, const char *fmt, ...)