diff options
author | antirez <antirez@gmail.com> | 2012-02-15 15:30:29 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-02-15 15:30:29 +0100 |
commit | b3a86b8209be03ea954dd13cf97a743c1f45796f (patch) | |
tree | e07d32de40f94438a9324df8cf0ccaf6743c430f | |
parent | 31f9f987ace301017b164964f95eb153ef8c74d5 (diff) | |
download | redis-b3a86b8209be03ea954dd13cf97a743c1f45796f.tar.gz |
Fixed a few broken stuff introduced while merging issue #327 related code in 2.4
-rw-r--r-- | src/redis.c | 6 | ||||
-rw-r--r-- | src/redis.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/redis.c b/src/redis.c index 4f6de4ff4..29ab6dd4b 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1564,9 +1564,9 @@ int freeMemoryIfNeeded(void) { mem_used -= obuf_bytes; } } - if (server.aof_state != REDIS_AOF_OFF) { - mem_used -= sdslen(server.aof_buf); - mem_used -= sdslen(server.aof_rewrite_buf); + if (server.appendonly) { + mem_used -= sdslen(server.aofbuf); + mem_used -= sdslen(server.bgrewritebuf); } /* Check if we are over the memory limit. */ diff --git a/src/redis.h b/src/redis.h index 3b3726366..e93916c30 100644 --- a/src/redis.h +++ b/src/redis.h @@ -716,6 +716,7 @@ void getClientsMaxBuffers(unsigned long *longest_output_list, sds getClientInfoString(redisClient *client); sds getAllClientsInfoString(void); void rewriteClientCommandVector(redisClient *c, int argc, ...); +unsigned long getClientOutputBufferMemoryUsage(redisClient *c); void flushSlavesOutputBuffers(void); #ifdef __GNUC__ |