fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-07 18:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1555 from mattsta/cluster-port-error-out

Browse Source 
Cluster port error out
This commit is contained in:
Salvatore Sanfilippo 2014-03-10 10:37:50 +01:00
commit 442b06db54
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cluster.c
View File

@ -329,6 +329,19 @@ void clusterInit(void) {
/* 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;
/* Port sanity check II
The other handshake port check is triggered too late to stop
us from trying to use a too-high cluster port number.
*/
if (server.port > (65535-REDIS_CLUSTER_PORT_INCR)) {
redisLog(REDIS_WARNING, "Redis port number too high. "
"Cluster communication port is 10,000 port "
"numbers higher than your Redis port. "
"Your Redis port number must be "
"lower than 55535.");
}
if (listenToPort(server.port+REDIS_CLUSTER_PORT_INCR, if (listenToPort(server.port+REDIS_CLUSTER_PORT_INCR,
server.cfd,&server.cfd_count) == REDIS_ERR) server.cfd,&server.cfd_count) == REDIS_ERR)
{ {

2
src/redis.c
View File

@ -1582,7 +1582,7 @@ int listenToPort(int port, int *fds, int *count) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"Creating Server TCP listening socket %s:%d: %s", "Creating Server TCP listening socket %s:%d: %s",
server.bindaddr[j] ? server.bindaddr[j] : "*", server.bindaddr[j] ? server.bindaddr[j] : "*",
server.port, server.neterr); port, server.neterr);
return REDIS_ERR; return REDIS_ERR;
} }
(*count)++; (*count)++;