summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2019-06-05 17:29:50 +0200
committerGitHub <noreply@github.com>2019-06-05 17:29:50 +0200
commitde035c94816722dd923e4aedd852869de79a5185 (patch)
treeaba343499fce5860dc09421b6d94fd15598f7381
parentfd0ee469ab165d0e005e9fe1fca1c4f5c604cd56 (diff)
parentd3ed53f11b66d8af4b2334e8651a2eded880d086 (diff)
downloadredis-de035c94816722dd923e4aedd852869de79a5185.tar.gz
Merge pull request #6148 from artix75/redis_bm_dev
Redis Benchmark: prevent CONFIG failure from exiting program
-rw-r--r--src/redis-benchmark.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index 2785167a8..1d16fa4ee 100644
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -1540,7 +1540,10 @@ int main(int argc, const char **argv) {
if (node->name) printf("%s ", node->name);
printf("%s:%d\n", node->ip, node->port);
node->redis_config = getRedisConfig(node->ip, node->port, NULL);
- if (node->redis_config == NULL) exit(1);
+ if (node->redis_config == NULL) {
+ fprintf(stderr, "WARN: could not fetch node CONFIG %s:%d\n",
+ node->ip, node->port);
+ }
}
printf("\n");
/* Automatically set thread number to node count if not specified
@@ -1550,7 +1553,8 @@ int main(int argc, const char **argv) {
} else {
config.redis_config =
getRedisConfig(config.hostip, config.hostport, config.hostsocket);
- if (config.redis_config == NULL) exit(1);
+ if (config.redis_config == NULL)
+ fprintf(stderr, "WARN: could not fetch server CONFIG\n");
}
if (config.num_threads > 0) {