Impovements for: Redis timer, hashes rehashing, keys collection.

[redis.git] / src / networking.c

diff --git a/src/networking.c b/src/networking.c
index 406d1cde3bc6891e6bbda6e65605e50cfcec43d3..f922e2975133d0deaf438c633a06a03dddc41855 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -618,7 +618,7 @@ void freeClient(redisClient *c) {
         /* We lost connection with our master, force our slaves to resync
          * with us as well to load the new data set.
          *
-         * If server.masterhost is NULL te user called SLAVEOF NO ONE so
+         * If server.masterhost is NULL the user called SLAVEOF NO ONE so
          * slave resync is not needed. */
         if (server.masterhost != NULL) disconnectSlaves();
     }
@@ -1085,7 +1085,7 @@ sds getClientInfoString(redisClient *client) {
     if (emask & AE_WRITABLE) *p++ = 'w';
     *p = '\0';
     return sdscatprintf(sdsempty(),
-        "addr=%s:%d fd=%d age=%ld idle=%ld flags=%s db=%d sub=%d psub=%d qbuf=%lu qbuf-free=%lu obl=%lu oll=%lu omem=%lu events=%s cmd=%s",
+        "addr=%s:%d fd=%d age=%ld idle=%ld flags=%s db=%d sub=%d psub=%d multi=%d qbuf=%lu qbuf-free=%lu obl=%lu oll=%lu omem=%lu events=%s cmd=%s",
         ip,port,client->fd,
         (long)(server.unixtime - client->ctime),
         (long)(server.unixtime - client->lastinteraction),
@@ -1093,6 +1093,7 @@ sds getClientInfoString(redisClient *client) {
         client->db->id,
         (int) dictSize(client->pubsub_channels),
         (int) listLength(client->pubsub_patterns),
+        (client->flags & REDIS_MULTI) ? client->mstate.count : -1,
         (unsigned long) sdslen(client->querybuf),
         (unsigned long) sdsavail(client->querybuf),
         (unsigned long) client->bufpos,