summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2015-02-04 18:36:38 +0000
committerChris Lamb <chris@chris-lamb.co.uk>2015-02-04 18:36:38 +0000
commitba74711e0609b92721fc2d5a13c90aa88f623254 (patch)
tree14bcfea26f927c73e1450f9187d6d037d4e52071
parentcf76af6b9fb7f808ac6f0ab79393d390a14f9cd9 (diff)
downloadredis-ba74711e0609b92721fc2d5a13c90aa88f623254.tar.gz
Support "1G" etc. units in CONFIG SET maxmemory
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
-rw-r--r--src/config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index 8255a56b7..927d7e245 100644
--- a/src/config.c
+++ b/src/config.c
@@ -643,8 +643,9 @@ void configSetCommand(redisClient *c) {
zfree(server.masterauth);
server.masterauth = ((char*)o->ptr)[0] ? zstrdup(o->ptr) : NULL;
} else if (!strcasecmp(c->argv[2]->ptr,"maxmemory")) {
- if (getLongLongFromObject(o,&ll) == REDIS_ERR ||
- ll < 0) goto badfmt;
+ int err;
+ ll = memtoll(o->ptr,&err);
+ if (err || ll < 0) goto badfmt;
server.maxmemory = ll;
if (server.maxmemory) {
if (server.maxmemory < zmalloc_used_memory()) {