fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 00:50:50 +00:00
Code Issues Projects Releases Wiki Activity

redis-cli: cliConnect() flags CC_FORCE and CC_QUIET.

Browse Source 
We need CC_QUIET in order to fix #5096 by silently failing if needed.
This commit is contained in:
antirez 2018-07-09 13:24:30 +02:00
parent a3a5a25fa0
commit 846203279c
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/redis-cli.c
View File

@ -136,6 +136,10 @@
#define LOG_COLOR_YELLOW "33;1m" #define LOG_COLOR_YELLOW "33;1m"
#define LOG_COLOR_RESET "0m" #define LOG_COLOR_RESET "0m"
/* cliConnect() flags. */
#define CC_FORCE (1<<0) /* Re-connect if already connected. */
#define CC_QUIET (1<<1) /* Don't log connecting errors. */
/* --latency-dist palettes. */ /* --latency-dist palettes. */
int spectrum_palette_color_size = 19; int spectrum_palette_color_size = 19;
int spectrum_palette_color[] = {0,233,234,235,237,239,241,243,245,247,144,143,142,184,226,214,208,202,196}; int spectrum_palette_color[] = {0,233,234,235,237,239,241,243,245,247,144,143,142,184,226,214,208,202,196};
@ -741,10 +745,12 @@ static int cliSelect(void) {
return REDIS_ERR; return REDIS_ERR;
} }
/* Connect to the server. If force is not zero the connection is performed /* Connect to the server. It is possible to pass certain flags to the function:
* even if there is already a connected socket. */ * CC_FORCE: The connection is performed even if there is already
static int cliConnect(int force) { * a connected socket.
if (context == NULL || force) { * CC_QUIET: Don't print errors if connection fails. */
static int cliConnect(int flags) {
if (context == NULL || flags & CC_FORCE) {
if (context != NULL) { if (context != NULL) {
redisFree(context); redisFree(context);
} }
@ -756,11 +762,15 @@ static int cliConnect(int force) {
} }
if (context->err) { if (context->err) {
fprintf(stderr,"Could not connect to Redis at "); if (!(flags & CC_QUIET)) {
if (config.hostsocket == NULL) fprintf(stderr,"Could not connect to Redis at ");
fprintf(stderr,"%s:%d: %s\n",config.hostip,config.hostport,context->errstr); if (config.hostsocket == NULL)
else fprintf(stderr,"%s:%d: %s\n",
fprintf(stderr,"%s: %s\n",config.hostsocket,context->errstr); config.hostip,config.hostport,context->errstr);
else
fprintf(stderr,"%s: %s\n",
config.hostsocket,context->errstr);
}
redisFree(context); redisFree(context);
context = NULL; context = NULL;
return REDIS_ERR; return REDIS_ERR;
@ -1524,7 +1534,7 @@ static int issueCommandRepeat(int argc, char **argv, long repeat) {
while (1) { while (1) {
config.cluster_reissue_command = 0; config.cluster_reissue_command = 0;
if (cliSendCommand(argc,argv,repeat) != REDIS_OK) { if (cliSendCommand(argc,argv,repeat) != REDIS_OK) {
cliConnect(1); cliConnect(CC_FORCE);
/* If we still cannot send the command print error. /* If we still cannot send the command print error.
* We'll try to reconnect the next time. */ * We'll try to reconnect the next time. */
@ -1535,7 +1545,7 @@ static int issueCommandRepeat(int argc, char **argv, long repeat) {
} }
/* Issue the command again if we got redirected in cluster mode */ /* Issue the command again if we got redirected in cluster mode */
if (config.cluster_mode && config.cluster_reissue_command) { if (config.cluster_mode && config.cluster_reissue_command) {
cliConnect(1); cliConnect(CC_FORCE);
} else { } else {
break; break;
} }
@ -1698,7 +1708,7 @@ static void repl(void) {
config.hostip = sdsnew(argv[1]); config.hostip = sdsnew(argv[1]);
config.hostport = atoi(argv[2]); config.hostport = atoi(argv[2]);
cliRefreshPrompt(); cliRefreshPrompt();
cliConnect(1); cliConnect(CC_FORCE);
} else if (argc == 1 && !strcasecmp(argv[0],"clear")) { } else if (argc == 1 && !strcasecmp(argv[0],"clear")) {
linenoiseClearScreen(); linenoiseClearScreen();
} else { } else {
@ -1822,7 +1832,7 @@ static int evalMode(int argc, char **argv) {
strncpy(config.prompt,"lua debugger> ",sizeof(config.prompt)); strncpy(config.prompt,"lua debugger> ",sizeof(config.prompt));
repl(); repl();
/* Restart the session if repl() returned. */ /* Restart the session if repl() returned. */
cliConnect(1); cliConnect(CC_FORCE);
printf("\n"); printf("\n");
} }
} else { } else {