X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/e2641e09cc0daf44f63f654230f72d22acf3a9af..38a154a9a6244826a8cb536347a60749cef2ee4a:/src/config.c diff --git a/src/config.c b/src/config.c index 6d946ee0..98fdb15d 100644 --- a/src/config.c +++ b/src/config.c @@ -55,7 +55,7 @@ void loadServerConfig(char *filename) { } /* Split into arguments */ - argv = sdssplitlen(line,sdslen(line)," ",1,&argc); + argv = sdssplitargs(line,&argc); sdstolower(argv[0]); /* Execute config directives */ @@ -66,11 +66,13 @@ void loadServerConfig(char *filename) { } } else if (!strcasecmp(argv[0],"port") && argc == 2) { server.port = atoi(argv[1]); - if (server.port < 1 || server.port > 65535) { + if (server.port < 0 || server.port > 65535) { err = "Invalid port"; goto loaderr; } } else if (!strcasecmp(argv[0],"bind") && argc == 2) { server.bindaddr = zstrdup(argv[1]); + } else if (!strcasecmp(argv[0],"unixsocket") && argc == 2) { + server.unixsocket = zstrdup(argv[1]); } else if (!strcasecmp(argv[0],"save") && argc == 3) { int seconds = atoi(argv[1]); int changes = atoi(argv[2]); @@ -112,6 +114,42 @@ void loadServerConfig(char *filename) { } fclose(logfp); } + } else if (!strcasecmp(argv[0],"syslog-enabled") && argc == 2) { + if ((server.syslog_enabled = yesnotoi(argv[1])) == -1) { + err = "argument must be 'yes' or 'no'"; goto loaderr; + } + } else if (!strcasecmp(argv[0],"syslog-ident") && argc == 2) { + if (server.syslog_ident) zfree(server.syslog_ident); + server.syslog_ident = zstrdup(argv[1]); + } else if (!strcasecmp(argv[0],"syslog-facility") && argc == 2) { + struct { + const char *name; + const int value; + } validSyslogFacilities[] = { + {"user", LOG_USER}, + {"local0", LOG_LOCAL0}, + {"local1", LOG_LOCAL1}, + {"local2", LOG_LOCAL2}, + {"local3", LOG_LOCAL3}, + {"local4", LOG_LOCAL4}, + {"local5", LOG_LOCAL5}, + {"local6", LOG_LOCAL6}, + {"local7", LOG_LOCAL7}, + {NULL, 0} + }; + int i; + + for (i = 0; validSyslogFacilities[i].name; i++) { + if (!strcasecmp(validSyslogFacilities[i].name, argv[1])) { + server.syslog_facility = validSyslogFacilities[i].value; + break; + } + } + + if (!validSyslogFacilities[i].name) { + err = "Invalid log facility. Must be one of USER or between LOCAL0-LOCAL7"; + goto loaderr; + } } else if (!strcasecmp(argv[0],"databases") && argc == 2) { server.dbnum = atoi(argv[1]); if (server.dbnum < 1) { @@ -123,16 +161,41 @@ void loadServerConfig(char *filename) { server.maxclients = atoi(argv[1]); } else if (!strcasecmp(argv[0],"maxmemory") && argc == 2) { server.maxmemory = memtoll(argv[1],NULL); + } else if (!strcasecmp(argv[0],"maxmemory-policy") && argc == 2) { + if (!strcasecmp(argv[1],"volatile-lru")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU; + } else if (!strcasecmp(argv[1],"volatile-random")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_RANDOM; + } else if (!strcasecmp(argv[1],"volatile-ttl")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_TTL; + } else if (!strcasecmp(argv[1],"allkeys-lru")) { + server.maxmemory_policy = REDIS_MAXMEMORY_ALLKEYS_LRU; + } else if (!strcasecmp(argv[1],"allkeys-random")) { + server.maxmemory_policy = REDIS_MAXMEMORY_ALLKEYS_RANDOM; + } else if (!strcasecmp(argv[1],"noeviction")) { + server.maxmemory_policy = REDIS_MAXMEMORY_NO_EVICTION; + } else { + err = "Invalid maxmemory policy"; + goto loaderr; + } + } else if (!strcasecmp(argv[0],"maxmemory-samples") && argc == 2) { + server.maxmemory_samples = atoi(argv[1]); + if (server.maxmemory_samples <= 0) { + err = "maxmemory-samples must be 1 or greater"; + goto loaderr; + } } else if (!strcasecmp(argv[0],"slaveof") && argc == 3) { server.masterhost = sdsnew(argv[1]); server.masterport = atoi(argv[2]); server.replstate = REDIS_REPL_CONNECT; } else if (!strcasecmp(argv[0],"masterauth") && argc == 2) { server.masterauth = zstrdup(argv[1]); - } else if (!strcasecmp(argv[0],"glueoutputbuf") && argc == 2) { - if ((server.glueoutputbuf = yesnotoi(argv[1])) == -1) { + } else if (!strcasecmp(argv[0],"slave-serve-stale-data") && argc == 2) { + if ((server.repl_serve_stale_data = yesnotoi(argv[1])) == -1) { err = "argument must be 'yes' or 'no'"; goto loaderr; } + } else if (!strcasecmp(argv[0],"glueoutputbuf")) { + redisLog(REDIS_WARNING, "Deprecated configuration directive: \"%s\"", argv[0]); } else if (!strcasecmp(argv[0],"rdbcompression") && argc == 2) { if ((server.rdbcompression = yesnotoi(argv[1])) == -1) { err = "argument must be 'yes' or 'no'"; goto loaderr; @@ -176,29 +239,63 @@ void loadServerConfig(char *filename) { } else if (!strcasecmp(argv[0],"dbfilename") && argc == 2) { zfree(server.dbfilename); server.dbfilename = zstrdup(argv[1]); - } else if (!strcasecmp(argv[0],"vm-enabled") && argc == 2) { - if ((server.vm_enabled = yesnotoi(argv[1])) == -1) { + } else if (!strcasecmp(argv[0],"diskstore-enabled") && argc == 2) { + if ((server.ds_enabled = yesnotoi(argv[1])) == -1) { err = "argument must be 'yes' or 'no'"; goto loaderr; } - } else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) { - zfree(server.vm_swap_file); - server.vm_swap_file = zstrdup(argv[1]); - } else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) { - server.vm_max_memory = memtoll(argv[1],NULL); - } else if (!strcasecmp(argv[0],"vm-page-size") && argc == 2) { - server.vm_page_size = memtoll(argv[1], NULL); - } else if (!strcasecmp(argv[0],"vm-pages") && argc == 2) { - server.vm_pages = memtoll(argv[1], NULL); - } else if (!strcasecmp(argv[0],"vm-max-threads") && argc == 2) { - server.vm_max_threads = strtoll(argv[1], NULL, 10); - } else if (!strcasecmp(argv[0],"hash-max-zipmap-entries") && argc == 2){ + } else if (!strcasecmp(argv[0],"diskstore-path") && argc == 2) { + sdsfree(server.ds_path); + server.ds_path = sdsnew(argv[1]); + } else if (!strcasecmp(argv[0],"cache-max-memory") && argc == 2) { + server.cache_max_memory = memtoll(argv[1],NULL); + } else if (!strcasecmp(argv[0],"cache-flush-delay") && argc == 2) { + server.cache_flush_delay = atoi(argv[1]); + if (server.cache_flush_delay < 0) server.cache_flush_delay = 0; + } else if (!strcasecmp(argv[0],"hash-max-zipmap-entries") && argc == 2) { server.hash_max_zipmap_entries = memtoll(argv[1], NULL); - } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2){ + } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2) { server.hash_max_zipmap_value = memtoll(argv[1], NULL); } else if (!strcasecmp(argv[0],"list-max-ziplist-entries") && argc == 2){ server.list_max_ziplist_entries = memtoll(argv[1], NULL); - } else if (!strcasecmp(argv[0],"list-max-ziplist-value") && argc == 2){ + } else if (!strcasecmp(argv[0],"list-max-ziplist-value") && argc == 2) { server.list_max_ziplist_value = memtoll(argv[1], NULL); + } else if (!strcasecmp(argv[0],"set-max-intset-entries") && argc == 2) { + server.set_max_intset_entries = memtoll(argv[1], NULL); + } else if (!strcasecmp(argv[0],"zset-max-ziplist-entries") && argc == 2) { + server.zset_max_ziplist_entries = memtoll(argv[1], NULL); + } else if (!strcasecmp(argv[0],"zset-max-ziplist-value") && argc == 2) { + server.zset_max_ziplist_value = memtoll(argv[1], NULL); + } else if (!strcasecmp(argv[0],"rename-command") && argc == 3) { + struct redisCommand *cmd = lookupCommand(argv[1]); + int retval; + + if (!cmd) { + err = "No such command in rename-command"; + goto loaderr; + } + + /* If the target command name is the emtpy string we just + * remove it from the command table. */ + retval = dictDelete(server.commands, argv[1]); + redisAssert(retval == DICT_OK); + + /* Otherwise we re-add the command under a different name. */ + if (sdslen(argv[2]) != 0) { + sds copy = sdsdup(argv[2]); + + retval = dictAdd(server.commands, copy, cmd); + if (retval != DICT_OK) { + sdsfree(copy); + err = "Target command name already exists"; goto loaderr; + } + } + } else if (!strcasecmp(argv[0],"cluster-enabled") && argc == 2) { + if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) { + err = "argument must be 'yes' or 'no'"; goto loaderr; + } + } else if (!strcasecmp(argv[0],"cluster-config-file") && argc == 2) { + zfree(server.cluster.configfile); + server.cluster.configfile = zstrdup(argv[1]); } else { err = "Bad directive or wrong number of arguments"; goto loaderr; } @@ -223,8 +320,11 @@ loaderr: *----------------------------------------------------------------------------*/ void configSetCommand(redisClient *c) { - robj *o = getDecodedObject(c->argv[3]); + robj *o; long long ll; + redisAssert(c->argv[2]->encoding == REDIS_ENCODING_RAW); + redisAssert(c->argv[3]->encoding == REDIS_ENCODING_RAW); + o = c->argv[3]; if (!strcasecmp(c->argv[2]->ptr,"dbfilename")) { zfree(server.dbfilename); @@ -239,6 +339,27 @@ void configSetCommand(redisClient *c) { if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; server.maxmemory = ll; + if (server.maxmemory) freeMemoryIfNeeded(); + } else if (!strcasecmp(c->argv[2]->ptr,"maxmemory-policy")) { + if (!strcasecmp(o->ptr,"volatile-lru")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU; + } else if (!strcasecmp(o->ptr,"volatile-random")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_RANDOM; + } else if (!strcasecmp(o->ptr,"volatile-ttl")) { + server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_TTL; + } else if (!strcasecmp(o->ptr,"allkeys-lru")) { + server.maxmemory_policy = REDIS_MAXMEMORY_ALLKEYS_LRU; + } else if (!strcasecmp(o->ptr,"allkeys-random")) { + server.maxmemory_policy = REDIS_MAXMEMORY_ALLKEYS_RANDOM; + } else if (!strcasecmp(o->ptr,"noeviction")) { + server.maxmemory_policy = REDIS_MAXMEMORY_NO_EVICTION; + } else { + goto badfmt; + } + } else if (!strcasecmp(c->argv[2]->ptr,"maxmemory-samples")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || + ll <= 0) goto badfmt; + server.maxmemory_samples = ll; } else if (!strcasecmp(c->argv[2]->ptr,"timeout")) { if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0 || ll > LONG_MAX) goto badfmt; @@ -268,9 +389,8 @@ void configSetCommand(redisClient *c) { stopAppendOnly(); } else { if (startAppendOnly() == REDIS_ERR) { - addReplySds(c,sdscatprintf(sdsempty(), - "-ERR Unable to turn on AOF. Check server logs.\r\n")); - decrRefCount(o); + addReplyError(c, + "Unable to turn on AOF. Check server logs."); return; } } @@ -309,34 +429,70 @@ void configSetCommand(redisClient *c) { appendServerSaveParams(seconds, changes); } sdsfreesplitres(v,vlen); + } else if (!strcasecmp(c->argv[2]->ptr,"slave-serve-stale-data")) { + int yn = yesnotoi(o->ptr); + + if (yn == -1) goto badfmt; + server.repl_serve_stale_data = yn; + } else if (!strcasecmp(c->argv[2]->ptr,"dir")) { + if (chdir((char*)o->ptr) == -1) { + addReplyErrorFormat(c,"Changing directory: %s", strerror(errno)); + return; + } + } else if (!strcasecmp(c->argv[2]->ptr,"hash-max-zipmap-entries")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.hash_max_zipmap_entries = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"hash-max-zipmap-value")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.hash_max_zipmap_value = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"list-max-ziplist-entries")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.list_max_ziplist_entries = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"list-max-ziplist-value")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.list_max_ziplist_value = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"set-max-intset-entries")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.set_max_intset_entries = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"zset-max-ziplist-entries")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.zset_max_ziplist_entries = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"zset-max-ziplist-value")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.zset_max_ziplist_value = ll; } else { - addReplySds(c,sdscatprintf(sdsempty(), - "-ERR not supported CONFIG parameter %s\r\n", - (char*)c->argv[2]->ptr)); - decrRefCount(o); + addReplyErrorFormat(c,"Unsupported CONFIG parameter: %s", + (char*)c->argv[2]->ptr); return; } - decrRefCount(o); addReply(c,shared.ok); return; badfmt: /* Bad format errors */ - addReplySds(c,sdscatprintf(sdsempty(), - "-ERR invalid argument '%s' for CONFIG SET '%s'\r\n", + addReplyErrorFormat(c,"Invalid argument '%s' for CONFIG SET '%s'", (char*)o->ptr, - (char*)c->argv[2]->ptr)); - decrRefCount(o); + (char*)c->argv[2]->ptr); } void configGetCommand(redisClient *c) { - robj *o = getDecodedObject(c->argv[2]); - robj *lenobj = createObject(REDIS_STRING,NULL); + robj *o = c->argv[2]; + void *replylen = addDeferredMultiBulkLength(c); char *pattern = o->ptr; + char buf[128]; int matches = 0; + redisAssert(o->encoding == REDIS_ENCODING_RAW); - addReply(c,lenobj); - decrRefCount(lenobj); + if (stringmatch(pattern,"dir",0)) { + char buf[1024]; + addReplyBulkCString(c,"dir"); + if (getcwd(buf,sizeof(buf)) == NULL) { + buf[0] = '\0'; + } else { + addReplyBulkCString(c,buf); + } + matches++; + } if (stringmatch(pattern,"dbfilename",0)) { addReplyBulkCString(c,"dbfilename"); addReplyBulkCString(c,server.dbfilename); @@ -353,17 +509,35 @@ void configGetCommand(redisClient *c) { matches++; } if (stringmatch(pattern,"maxmemory",0)) { - char buf[128]; - - ll2string(buf,128,server.maxmemory); + ll2string(buf,sizeof(buf),server.maxmemory); addReplyBulkCString(c,"maxmemory"); addReplyBulkCString(c,buf); matches++; } - if (stringmatch(pattern,"timeout",0)) { - char buf[128]; + if (stringmatch(pattern,"maxmemory-policy",0)) { + char *s; - ll2string(buf,128,server.maxidletime); + switch(server.maxmemory_policy) { + case REDIS_MAXMEMORY_VOLATILE_LRU: s = "volatile-lru"; break; + case REDIS_MAXMEMORY_VOLATILE_TTL: s = "volatile-ttl"; break; + case REDIS_MAXMEMORY_VOLATILE_RANDOM: s = "volatile-random"; break; + case REDIS_MAXMEMORY_ALLKEYS_LRU: s = "allkeys-lru"; break; + case REDIS_MAXMEMORY_ALLKEYS_RANDOM: s = "allkeys-random"; break; + case REDIS_MAXMEMORY_NO_EVICTION: s = "noeviction"; break; + default: s = "unknown"; break; /* too harmless to panic */ + } + addReplyBulkCString(c,"maxmemory-policy"); + addReplyBulkCString(c,s); + matches++; + } + if (stringmatch(pattern,"maxmemory-samples",0)) { + ll2string(buf,sizeof(buf),server.maxmemory_samples); + addReplyBulkCString(c,"maxmemory-samples"); + addReplyBulkCString(c,buf); + matches++; + } + if (stringmatch(pattern,"timeout",0)) { + ll2string(buf,sizeof(buf),server.maxidletime); addReplyBulkCString(c,"timeout"); addReplyBulkCString(c,buf); matches++; @@ -407,8 +581,47 @@ void configGetCommand(redisClient *c) { sdsfree(buf); matches++; } - decrRefCount(o); - lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",matches*2); + if (stringmatch(pattern,"slave-serve-stale-data",0)) { + addReplyBulkCString(c,"slave-serve-stale-data"); + addReplyBulkCString(c,server.repl_serve_stale_data ? "yes" : "no"); + matches++; + } + if (stringmatch(pattern,"hash-max-zipmap-entries",0)) { + addReplyBulkCString(c,"hash-max-zipmap-entries"); + addReplyBulkLongLong(c,server.hash_max_zipmap_entries); + matches++; + } + if (stringmatch(pattern,"hash-max-zipmap-value",0)) { + addReplyBulkCString(c,"hash-max-zipmap-value"); + addReplyBulkLongLong(c,server.hash_max_zipmap_value); + matches++; + } + if (stringmatch(pattern,"list-max-ziplist-entries",0)) { + addReplyBulkCString(c,"list-max-ziplist-entries"); + addReplyBulkLongLong(c,server.list_max_ziplist_entries); + matches++; + } + if (stringmatch(pattern,"list-max-ziplist-value",0)) { + addReplyBulkCString(c,"list-max-ziplist-value"); + addReplyBulkLongLong(c,server.list_max_ziplist_value); + matches++; + } + if (stringmatch(pattern,"set-max-intset-entries",0)) { + addReplyBulkCString(c,"set-max-intset-entries"); + addReplyBulkLongLong(c,server.set_max_intset_entries); + matches++; + } + if (stringmatch(pattern,"zset-max-ziplist-entries",0)) { + addReplyBulkCString(c,"zset-max-ziplist-entries"); + addReplyBulkLongLong(c,server.zset_max_ziplist_entries); + matches++; + } + if (stringmatch(pattern,"zset-max-ziplist-value",0)) { + addReplyBulkCString(c,"zset-max-ziplist-value"); + addReplyBulkLongLong(c,server.zset_max_ziplist_value); + matches++; + } + setDeferredMultiBulkLength(c,replylen,matches*2); } void configCommand(redisClient *c) { @@ -420,19 +633,20 @@ void configCommand(redisClient *c) { configGetCommand(c); } else if (!strcasecmp(c->argv[1]->ptr,"resetstat")) { if (c->argc != 2) goto badarity; + server.stat_keyspace_hits = 0; + server.stat_keyspace_misses = 0; server.stat_numcommands = 0; server.stat_numconnections = 0; server.stat_expiredkeys = 0; - server.stat_starttime = time(NULL); + resetCommandTableStats(); addReply(c,shared.ok); } else { - addReplySds(c,sdscatprintf(sdsempty(), - "-ERR CONFIG subcommand must be one of GET, SET, RESETSTAT\r\n")); + addReplyError(c, + "CONFIG subcommand must be one of GET, SET, RESETSTAT"); } return; badarity: - addReplySds(c,sdscatprintf(sdsempty(), - "-ERR Wrong number of arguments for CONFIG %s\r\n", - (char*) c->argv[1]->ptr)); + addReplyErrorFormat(c,"Wrong number of arguments for CONFIG %s", + (char*) c->argv[1]->ptr); }