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

Don't reset the client when processCommand returns REDIS_ERR

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-10-15 17:27:05 +02:00
parent 9ddc6fded8
commit c5a32adaed
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/networking.c
View File

@ -820,9 +820,13 @@ void processInputBuffer(redisClient *c) {
}
/* Multibulk processing could see a <= 0 length. */
if (c->argc > 0)
processCommand(c);
resetClient(c);
if (c->argc == 0) {
resetClient(c);
} else {
/* Only reset the client when the command was executed. */
if (processCommand(c) == REDIS_OK)
resetClient(c);
}
}
}

2
src/redis.c
View File

@ -955,7 +955,7 @@ int processCommand(redisClient *c) {
addReply(c,shared.queued);
} else {
if (server.vm_enabled && server.vm_max_threads > 0 &&
blockClientOnSwappedKeys(c,cmd)) return 1;
blockClientOnSwappedKeys(c,cmd)) return REDIS_ERR;
call(c,cmd);
}
return REDIS_OK;