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

Unify two client flags that mean the same

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-10-28 15:07:45 +01:00
parent a375b077cc
commit 5e78edb350
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/networking.c
View File

@ -541,7 +541,6 @@ void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE); aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE);
/* Close connection after entire reply has been sent. */ /* Close connection after entire reply has been sent. */
if (c->flags & REDIS_QUIT) freeClient(c);
if (c->flags & REDIS_CLOSE_AFTER_REPLY) freeClient(c); if (c->flags & REDIS_CLOSE_AFTER_REPLY) freeClient(c);
} }
} }
@ -802,9 +801,10 @@ void processInputBuffer(redisClient *c) {
* will try to reiterate. The following line will make it return asap. */ * will try to reiterate. The following line will make it return asap. */
if (c->flags & REDIS_BLOCKED || c->flags & REDIS_IO_WAIT) return; if (c->flags & REDIS_BLOCKED || c->flags & REDIS_IO_WAIT) return;
/* Never continue to process the input buffer after QUIT. After the output /* REDIS_CLOSE_AFTER_REPLY closes the connection once the reply is
* buffer is flushed (with the OK), the connection will be dropped. */ * written to the client. Make sure to not let the reply grow after
if (c->flags & REDIS_QUIT) return; * this flag has been set (i.e. don't process more commands). */
if (c->flags & REDIS_CLOSE_AFTER_REPLY) return;
/* Determine request type when unknown. */ /* Determine request type when unknown. */
if (!c->reqtype) { if (!c->reqtype) {

4
src/redis.c
View File

@ -893,10 +893,10 @@ int processCommand(redisClient *c) {
* go through checking for replication and QUIT will cause trouble * go through checking for replication and QUIT will cause trouble
* when FORCE_REPLICATION is enabled and would be implemented in * when FORCE_REPLICATION is enabled and would be implemented in
* a regular command proc. */ * a regular command proc. */
redisAssert(!(c->flags & REDIS_QUIT)); redisAssert(!(c->flags & REDIS_CLOSE_AFTER_REPLY));
if (!strcasecmp(c->argv[0]->ptr,"quit")) { if (!strcasecmp(c->argv[0]->ptr,"quit")) {
c->flags |= REDIS_QUIT;
addReply(c,shared.ok); addReply(c,shared.ok);
c->flags |= REDIS_CLOSE_AFTER_REPLY;
return REDIS_ERR; return REDIS_ERR;
} }

4
src/redis.h
View File

@ -144,9 +144,7 @@
#define REDIS_BLOCKED 16 /* The client is waiting in a blocking operation */ #define REDIS_BLOCKED 16 /* The client is waiting in a blocking operation */
#define REDIS_IO_WAIT 32 /* The client is waiting for Virtual Memory I/O */ #define REDIS_IO_WAIT 32 /* The client is waiting for Virtual Memory I/O */
#define REDIS_DIRTY_CAS 64 /* Watched keys modified. EXEC will fail. */ #define REDIS_DIRTY_CAS 64 /* Watched keys modified. EXEC will fail. */
#define REDIS_QUIT 128 /* Client will be disconnected after reply is sent */ #define REDIS_CLOSE_AFTER_REPLY 128 /* Close after writing entire reply. */
#define REDIS_CLOSE_AFTER_REPLY 256 /* Close connection immediately once the
* reply has been sent. */
/* Client request types */ /* Client request types */
#define REDIS_REQ_INLINE 1 #define REDIS_REQ_INLINE 1