summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-03-10 10:41:27 +0100
committerantirez <antirez@gmail.com>2014-03-11 11:10:09 +0100
commitd610d2343d821966bbd026e3b37b785f59f32c69 (patch)
tree352e9e55cac351f451875d3140076f401e17d13f
parent2a951ce5020d56752d6d7cf756f70c56eb7ed7f6 (diff)
downloadredis-d610d2343d821966bbd026e3b37b785f59f32c69.tar.gz
Cluster: abort on port too high error.
It also fixes multi-line comment style to be consistent with the rest of the code base. Related to #1555.
-rw-r--r--src/cluster.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cluster.c b/src/cluster.c
index 3ce8bc513..622b90a18 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -331,15 +331,15 @@ void clusterInit(void) {
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.
- */
+ * 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.");
+ exit(1);
}
if (listenToPort(server.port+REDIS_CLUSTER_PORT_INCR,