Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

show active events in client file descriptor in CLIENT LIST.

  • Loading branch information...
commit 93babe4b4112752d28c6aa28004d84fa9fb1e543 1 parent 713b4c5
@antirez authored
Showing with 11 additions and 3 deletions.
  1. +11 −3 src/networking.c
View
14 src/networking.c
@@ -885,9 +885,10 @@ void getClientsMaxBuffers(unsigned long *longest_output_list,
/* Turn a Redis client into an sds string representing its state. */
sds getClientInfoString(redisClient *client) {
- char ip[32], flags[16], *p;
+ char ip[32], flags[16], events[3], *p;
int port;
time_t now = time(NULL);
+ int emask;
if (anetPeerToString(client->fd,ip,&port) == -1) {
ip[0] = '?';
@@ -910,8 +911,14 @@ sds getClientInfoString(redisClient *client) {
if (client->flags & REDIS_CLOSE_AFTER_REPLY) *p++ = 'c';
if (client->flags & REDIS_UNBLOCKED) *p++ = 'u';
*p++ = '\0';
+
+ emask = client->fd == -1 ? 0 : aeGetFileEvents(server.el,client->fd);
+ p = events;
+ if (emask & AE_READABLE) *p++ = 'r';
+ if (emask & AE_WRITABLE) *p++ = 'w';
+ *p = '\0';
return sdscatprintf(sdsempty(),
- "addr=%s:%d fd=%d idle=%ld flags=%s db=%d sub=%d psub=%d qbuf=%lu obl=%lu oll=%lu",
+ "addr=%s:%d fd=%d idle=%ld flags=%s db=%d sub=%d psub=%d qbuf=%lu obl=%lu oll=%lu events=%s",
ip,port,client->fd,
(long)(now - client->lastinteraction),
flags,
@@ -920,7 +927,8 @@ sds getClientInfoString(redisClient *client) {
(int) listLength(client->pubsub_patterns),
(unsigned long) sdslen(client->querybuf),
(unsigned long) client->bufpos,
- (unsigned long) listLength(client->reply));
+ (unsigned long) listLength(client->reply),
+ events);
}
void clientCommand(redisClient *c) {
Please sign in to comment.
Something went wrong with that request. Please try again.