From 71d0e7e0ea97903c0fe631bc97ff49d60a418d86 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 9 May 2014 16:36:59 +0200 Subject: [PATCH] CLUSTER MEET: better error messages when address is invalid. Fixes issue #1734. --- src/cluster.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index 154d9b85..ddea84be 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -3287,17 +3287,19 @@ void clusterCommand(redisClient *c) { } if (!strcasecmp(c->argv[1]->ptr,"meet") && c->argc == 4) { - long port; + long long port; - if (getLongFromObjectOrReply(c, c->argv[3], &port, NULL) != REDIS_OK) { - addReplyError(c,"Invalid TCP port specified"); + if (getLongLongFromObject(c->argv[3], &port) != REDIS_OK) { + addReplyErrorFormat(c,"Invalid TCP port specified: %s", + (char*)c->argv[3]->ptr); return; } if (clusterStartHandshake(c->argv[2]->ptr,port) == 0 && errno == EINVAL) { - addReplyError(c,"Invalid node address specified"); + addReplyErrorFormat(c,"Invalid node address specified: %s:%s", + (char*)c->argv[2]->ptr, (char*)c->argv[3]->ptr); } else { addReply(c,shared.ok); }