gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '214555b02ea448c444fb6a32ecfc5f312fc052b8' into unstable

Browse Source 
Former-commit-id: 15bed4bbcc962ec1e8ad5f57653534b721df9a70
This commit is contained in:
John Sully 2019-07-18 23:26:46 -04:00
commit 11b12219eb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/redis-benchmark.cpp
View File

@ -1546,7 +1546,10 @@ int main(int argc, const char **argv) {
if (node->name) printf("%s ", node->name); if (node->name) printf("%s ", node->name);
printf("%s:%d\n", node->ip, node->port); printf("%s:%d\n", node->ip, node->port);
node->redis_config = getRedisConfig(node->ip, node->port, NULL); 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"); printf("\n");
/* Automatically set thread number to node count if not specified /* Automatically set thread number to node count if not specified
@ -1556,7 +1559,8 @@ int main(int argc, const char **argv) {
} else { } else {
config.redis_config = config.redis_config =
getRedisConfig(config.hostip, config.hostport, config.hostsocket); 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) { if (config.num_threads > 0) {