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

CLIENT KILL API modified.

Browse Source 
Added a new SKIPME option that is true by default, that prevents the
client sending the command to be killed, unless SKIPME NO is sent.
This commit is contained in:
antirez 2014-06-16 14:50:15 +02:00
parent e06b3819ea
commit bb2011d992
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/networking.c
View File

@ -1352,32 +1352,43 @@ void clientCommand(redisClient *c) {
sdsfree(o); sdsfree(o);
} else if (!strcasecmp(c->argv[1]->ptr,"kill")) { } else if (!strcasecmp(c->argv[1]->ptr,"kill")) {
/* CLIENT KILL <ip:port> /* CLIENT KILL <ip:port>
* CLIENT KILL <attrib> <value> */ * CLIENT KILL <option> [value] ... <option> [value] */
char *addr = NULL; char *addr = NULL;
int type = -1; int type = -1;
uint64_t id = 0; uint64_t id = 0;
int killed = 0; int skipme = 1;
int close_this_client = 0; int killed = 0, close_this_client = 0;
/* Parse arguments. */
if (c->argc == 3) { if (c->argc == 3) {
/* Old style syntax: CLIENT KILL <addr> */
addr = c->argv[2]->ptr; addr = c->argv[2]->ptr;
} else if (c->argc == 4) { } else if (c->argc > 3) {
if (!strcasecmp(c->argv[2]->ptr,"id")) { int i = 2; /* Next option index. */
/* New style syntax: parse options. */
while(i < c->argc) {
int moreargs = c->argc > i+1;
if (!strcasecmp(c->argv[i]->ptr,"id") && moreargs) {
long long tmp; long long tmp;
if (getLongLongFromObjectOrReply(c,c->argv[3],&tmp,NULL) if (getLongLongFromObjectOrReply(c,c->argv[i+1],&tmp,NULL)
!= REDIS_OK) return; != REDIS_OK) return;
id = tmp; id = tmp;
} else if (!strcasecmp(c->argv[2]->ptr,"type")) { } else if (!strcasecmp(c->argv[i]->ptr,"type") && moreargs) {
type = getClientTypeByName(c->argv[3]->ptr); type = getClientTypeByName(c->argv[i+1]->ptr);
if (type == -1) { if (type == -1) {
addReplyErrorFormat(c,"Unknown client type '%s'", addReplyErrorFormat(c,"Unknown client type '%s'",
(char*) c->argv[3]->ptr); (char*) c->argv[i+1]->ptr);
return; return;
} }
} else if (!strcasecmp(c->argv[2]->ptr,"addr")) { } else if (!strcasecmp(c->argv[i]->ptr,"addr") && moreargs) {
addr = c->argv[3]->ptr; addr = c->argv[i+1]->ptr;
} else if (!strcasecmp(c->argv[i]->ptr,"skipme") && moreargs) {
if (!strcasecmp(c->argv[i+1]->ptr,"yes")) {
skipme = 1;
} else if (!strcasecmp(c->argv[i+1]->ptr,"no")) {
skipme = 0;
} else { } else {
addReply(c,shared.syntaxerr); addReply(c,shared.syntaxerr);
return; return;
@ -1386,6 +1397,12 @@ void clientCommand(redisClient *c) {
addReply(c,shared.syntaxerr); addReply(c,shared.syntaxerr);
return; return;
} }
i += 2;
}
} else {
addReply(c,shared.syntaxerr);
return;
}
/* Iterate clients killing all the matching clients. */ /* Iterate clients killing all the matching clients. */
listRewind(server.clients,&li); listRewind(server.clients,&li);
@ -1394,6 +1411,7 @@ void clientCommand(redisClient *c) {
if (addr && strcmp(getClientPeerId(client),addr) != 0) continue; if (addr && strcmp(getClientPeerId(client),addr) != 0) continue;
if (type != -1 && getClientType(client) != type) continue; if (type != -1 && getClientType(client) != type) continue;
if (id != 0 && client->id != id) continue; if (id != 0 && client->id != id) continue;
if (c == client && skipme) continue;
/* Kill it. */ /* Kill it. */
if (c == client) { if (c == client) {