Commit b3a86b82 authored by antirez's avatar antirez
Browse files

Fixed a few broken stuff introduced while merging issue #327 related code in 2.4

parent 31f9f987
...@@ -1564,9 +1564,9 @@ int freeMemoryIfNeeded(void) { ...@@ -1564,9 +1564,9 @@ int freeMemoryIfNeeded(void) {
mem_used -= obuf_bytes; mem_used -= obuf_bytes;
} }
} }
if (server.aof_state != REDIS_AOF_OFF) { if (server.appendonly) {
mem_used -= sdslen(server.aof_buf); mem_used -= sdslen(server.aofbuf);
mem_used -= sdslen(server.aof_rewrite_buf); mem_used -= sdslen(server.bgrewritebuf);
} }
/* Check if we are over the memory limit. */ /* Check if we are over the memory limit. */
......
...@@ -716,6 +716,7 @@ void getClientsMaxBuffers(unsigned long *longest_output_list, ...@@ -716,6 +716,7 @@ void getClientsMaxBuffers(unsigned long *longest_output_list,
sds getClientInfoString(redisClient *client); sds getClientInfoString(redisClient *client);
sds getAllClientsInfoString(void); sds getAllClientsInfoString(void);
void rewriteClientCommandVector(redisClient *c, int argc, ...); void rewriteClientCommandVector(redisClient *c, int argc, ...);
unsigned long getClientOutputBufferMemoryUsage(redisClient *c);
void flushSlavesOutputBuffers(void); void flushSlavesOutputBuffers(void);
#ifdef __GNUC__ #ifdef __GNUC__
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment