From 14086a46ca69f267d909817eb6bbcd1d976d94f2 Mon Sep 17 00:00:00 2001
From: therealbill <therealbill@me.com>
Date: Fri, 22 Apr 2016 10:43:48 -0500
Subject: [PATCH] fix for #3187

I've renamed maxmemoryToString to evictPolicyToString since that is
more accurate (and easier to mentally connect with the correct data), as
well as updated the function to user server.maxmemory_policy rather than
server.maxmemory. Now with a default config it is actually returning
the correct policy rather than volatile-lru.
---
 src/config.c | 4 ++--
 src/server.c | 2 +-
 src/server.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/config.c b/src/config.c
index e5ee5dd6..d9ea05d0 100644
--- a/src/config.c
+++ b/src/config.c
@@ -126,8 +126,8 @@ const char *configEnumGetNameOrUnknown(configEnum *ce, int val) {
 }
 
 /* Used for INFO generation. */
-const char *maxmemoryToString(void) {
-    return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory);
+const char *evictPolicyToString(void) {
+    return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory_policy);
 }
 
 /*-----------------------------------------------------------------------------
diff --git a/src/server.c b/src/server.c
index 484716ab..7e73f272 100644
--- a/src/server.c
+++ b/src/server.c
@@ -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
diff --git a/src/server.h b/src/server.h
index c819ccb2..0655fc34 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1368,7 +1368,7 @@ void closeListeningSockets(int unlink_unix_socket);
 void updateCachedTime(void);
 void resetServerStats(void);
 unsigned int getLRUClock(void);
-const char *maxmemoryToString(void);
+const char *evictPolicyToString(void);
 
 #define RESTART_SERVER_NONE 0
 #define RESTART_SERVER_GRACEFULLY (1<<0)     /* Do proper shutdown. */