From d32fd315886a45426e8f6991ab8879b9a7756443 Mon Sep 17 00:00:00 2001 From: Oran Agra Date: Sun, 9 May 2021 18:19:25 +0300 Subject: redis-benchmark bad check for NOAUTH and NOPERM (#8931) also, print errors to stderr rather than stdout --- src/redis-benchmark.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c index 63fe5ce05..d124bc0dd 100644 --- a/src/redis-benchmark.c +++ b/src/redis-benchmark.c @@ -362,9 +362,9 @@ fail: else fprintf(stderr, "%s\n", hostsocket); int abort_test = 0; if (reply && reply->type == REDIS_REPLY_ERROR && - (!strncmp(reply->str,"NOAUTH",5) || + (!strncmp(reply->str,"NOAUTH",6) || !strncmp(reply->str,"WRONGPASS",9) || - !strncmp(reply->str,"NOPERM",5))) + !strncmp(reply->str,"NOPERM",6))) abort_test = 1; freeReplyObject(reply); redisFree(c); @@ -530,21 +530,21 @@ static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask) { * before requesting the new configuration. */ fetch_slots = 1; do_wait = 1; - printf("Error from server %s:%d: %s.\n", - c->cluster_node->ip, - c->cluster_node->port, - r->str); + fprintf(stderr, "Error from server %s:%d: %s.\n", + c->cluster_node->ip, + c->cluster_node->port, + r->str); } if (do_wait) sleep(1); if (fetch_slots && !fetchClusterSlotsConfiguration(c)) exit(1); } else { if (c->cluster_node) { - printf("Error from server %s:%d: %s\n", - c->cluster_node->ip, - c->cluster_node->port, - r->str); - } else printf("Error from server: %s\n", r->str); + fprintf(stderr, "Error from server %s:%d: %s\n", + c->cluster_node->ip, + c->cluster_node->port, + r->str); + } else fprintf(stderr, "Error from server: %s\n", r->str); exit(1); } } -- cgit v1.2.1