fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-19 20:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3188 from therealbill/unstable

Browse Source 
maxmemory_policy fix for #3187
This commit is contained in:
Salvatore Sanfilippo
2016-05-05 09:02:25 +02:00
parent de3a6736f7 14086a46ca
commit 91b4966783
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.c
View File

@ -2937,7 +2937,7 @@ sds genRedisInfoString(char *section) {
char maxmemory_hmem[64];
size_t zmalloc_used = zmalloc_used_memory();
size_t total_system_mem = server.system_memory_size;
const char *evict_policy = maxmemoryToString();
const char *evict_policy = evictPolicyToString();
long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024;
/* Peak memory is updated from time to time by serverCron() so it