X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/cc7c4158bc9c584b91560e9bf3dff51a9316c9b3..07ac2daaaa6c844cc3171c8f01ad5ad7e786e2ea:/src/config.c diff --git a/src/config.c b/src/config.c index 79c367bf..9f71aaf6 100644 --- a/src/config.c +++ b/src/config.c @@ -66,13 +66,19 @@ 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],"unixsocketperm") && argc == 2) { + errno = 0; + server.unixsocketperm = (mode_t)strtol(argv[1], NULL, 8); + if (errno || server.unixsocketperm > 0777) { + err = "Invalid socket file permissions"; goto loaderr; + } } else if (!strcasecmp(argv[0],"save") && argc == 3) { int seconds = atoi(argv[1]); int changes = atoi(argv[2]); @@ -188,16 +194,26 @@ void loadServerConfig(char *filename) { server.masterhost = sdsnew(argv[1]); server.masterport = atoi(argv[2]); server.replstate = REDIS_REPL_CONNECT; + } else if (!strcasecmp(argv[0],"repl-ping-slave-period") && argc == 2) { + server.repl_ping_slave_period = atoi(argv[1]); + if (server.repl_ping_slave_period <= 0) { + err = "repl-ping-slave-period must be 1 or greater"; + goto loaderr; + } + } else if (!strcasecmp(argv[0],"repl-timeout") && argc == 2) { + server.repl_timeout = atoi(argv[1]); + if (server.repl_timeout <= 0) { + err = "repl-timeout must be 1 or greater"; + goto loaderr; + } } else if (!strcasecmp(argv[0],"masterauth") && argc == 2) { server.masterauth = zstrdup(argv[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") && argc == 2) { - if ((server.glueoutputbuf = 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; @@ -233,6 +249,18 @@ void loadServerConfig(char *filename) { err = "argument must be 'no', 'always' or 'everysec'"; goto loaderr; } + } else if (!strcasecmp(argv[0],"auto-aof-rewrite-percentage") && + argc == 2) + { + server.auto_aofrewrite_perc = atoi(argv[1]); + if (server.auto_aofrewrite_perc < 0) { + err = "Invalid negative percentage for AOF auto rewrite"; + goto loaderr; + } + } else if (!strcasecmp(argv[0],"auto-aof-rewrite-min-size") && + argc == 2) + { + server.auto_aofrewrite_min_size = memtoll(argv[1],NULL); } else if (!strcasecmp(argv[0],"requirepass") && argc == 2) { server.requirepass = zstrdup(argv[1]); } else if (!strcasecmp(argv[0],"pidfile") && argc == 2) { @@ -241,21 +269,6 @@ 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) { - 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) { server.hash_max_zipmap_entries = memtoll(argv[1], NULL); } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2) { @@ -266,6 +279,10 @@ void loadServerConfig(char *filename) { 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; @@ -290,6 +307,21 @@ void loadServerConfig(char *filename) { 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 if (!strcasecmp(argv[0],"lua-time-limit") && argc == 2) { + server.lua_time_limit = strtoll(argv[1],NULL,10); + } else if (!strcasecmp(argv[0],"slowlog-log-slower-than") && + argc == 2) + { + server.slowlog_log_slower_than = strtoll(argv[1],NULL,10); + } else if (!strcasecmp(argv[0],"slowlog-max-len") && argc == 2) { + server.slowlog_max_len = strtoll(argv[1],NULL,10); } else { err = "Bad directive or wrong number of arguments"; goto loaderr; } @@ -316,8 +348,8 @@ loaderr: void configSetCommand(redisClient *c) { robj *o; long long ll; - redisAssert(c->argv[2]->encoding == REDIS_ENCODING_RAW); - redisAssert(c->argv[3]->encoding == REDIS_ENCODING_RAW); + redisAssertWithInfo(c,c->argv[2],c->argv[2]->encoding == REDIS_ENCODING_RAW); + redisAssertWithInfo(c,c->argv[2],c->argv[3]->encoding == REDIS_ENCODING_RAW); o = c->argv[3]; if (!strcasecmp(c->argv[2]->ptr,"dbfilename")) { @@ -325,7 +357,7 @@ void configSetCommand(redisClient *c) { server.dbfilename = zstrdup(o->ptr); } else if (!strcasecmp(c->argv[2]->ptr,"requirepass")) { zfree(server.requirepass); - server.requirepass = zstrdup(o->ptr); + server.requirepass = ((char*)o->ptr)[0] ? zstrdup(o->ptr) : NULL; } else if (!strcasecmp(c->argv[2]->ptr,"masterauth")) { zfree(server.masterauth); server.masterauth = zstrdup(o->ptr); @@ -389,6 +421,12 @@ void configSetCommand(redisClient *c) { } } } + } else if (!strcasecmp(c->argv[2]->ptr,"auto-aof-rewrite-percentage")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.auto_aofrewrite_perc = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"auto-aof-rewrite-min-size")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.auto_aofrewrite_min_size = ll; } else if (!strcasecmp(c->argv[2]->ptr,"save")) { int vlen, j; sds *v = sdssplitlen(o->ptr,sdslen(o->ptr)," ",1,&vlen); @@ -428,6 +466,53 @@ void configSetCommand(redisClient *c) { 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 if (!strcasecmp(c->argv[2]->ptr,"lua-time-limit")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.lua_time_limit = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"slowlog-log-slower-than")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR) goto badfmt; + server.slowlog_log_slower_than = ll; + } else if (!strcasecmp(c->argv[2]->ptr,"slowlog-max-len")) { + if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt; + server.slowlog_max_len = (unsigned)ll; + } else if (!strcasecmp(c->argv[2]->ptr,"loglevel")) { + if (!strcasecmp(o->ptr,"warning")) { + server.verbosity = REDIS_WARNING; + } else if (!strcasecmp(o->ptr,"notice")) { + server.verbosity = REDIS_NOTICE; + } else if (!strcasecmp(o->ptr,"verbose")) { + server.verbosity = REDIS_VERBOSE; + } else if (!strcasecmp(o->ptr,"debug")) { + server.verbosity = REDIS_DEBUG; + } else { + goto badfmt; + } } else { addReplyErrorFormat(c,"Unsupported CONFIG parameter: %s", (char*)c->argv[2]->ptr); @@ -448,8 +533,18 @@ void configGetCommand(redisClient *c) { char *pattern = o->ptr; char buf[128]; int matches = 0; - redisAssert(o->encoding == REDIS_ENCODING_RAW); + redisAssertWithInfo(c,o,o->encoding == REDIS_ENCODING_RAW); + + if (stringmatch(pattern,"dir",0)) { + char buf[1024]; + if (getcwd(buf,sizeof(buf)) == NULL) + buf[0] = '\0'; + + addReplyBulkCString(c,"dir"); + addReplyBulkCString(c,buf); + matches++; + } if (stringmatch(pattern,"dbfilename",0)) { addReplyBulkCString(c,"dbfilename"); addReplyBulkCString(c,server.dbfilename); @@ -538,11 +633,85 @@ void configGetCommand(redisClient *c) { sdsfree(buf); matches++; } + if (stringmatch(pattern,"auto-aof-rewrite-percentage",0)) { + addReplyBulkCString(c,"auto-aof-rewrite-percentage"); + addReplyBulkLongLong(c,server.auto_aofrewrite_perc); + matches++; + } + if (stringmatch(pattern,"auto-aof-rewrite-min-size",0)) { + addReplyBulkCString(c,"auto-aof-rewrite-min-size"); + addReplyBulkLongLong(c,server.auto_aofrewrite_min_size); + matches++; + } 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++; + } + if (stringmatch(pattern,"lua-time-limit",0)) { + addReplyBulkCString(c,"lua-time-limit"); + addReplyBulkLongLong(c,server.lua_time_limit); + matches++; + } + if (stringmatch(pattern,"slowlog-log-slower-than",0)) { + addReplyBulkCString(c,"slowlog-log-slower-than"); + addReplyBulkLongLong(c,server.slowlog_log_slower_than); + matches++; + } + if (stringmatch(pattern,"slowlog-max-len",0)) { + addReplyBulkCString(c,"slowlog-max-len"); + addReplyBulkLongLong(c,server.slowlog_max_len); + matches++; + } + if (stringmatch(pattern,"loglevel",0)) { + char *s; + + switch(server.verbosity) { + case REDIS_WARNING: s = "warning"; break; + case REDIS_VERBOSE: s = "verbose"; break; + case REDIS_NOTICE: s = "notice"; break; + case REDIS_DEBUG: s = "debug"; break; + default: s = "unknown"; break; /* too harmless to panic */ + } + addReplyBulkCString(c,"loglevel"); + addReplyBulkCString(c,s); + matches++; + } setDeferredMultiBulkLength(c,replylen,matches*2); } @@ -560,6 +729,7 @@ void configCommand(redisClient *c) { server.stat_numcommands = 0; server.stat_numconnections = 0; server.stat_expiredkeys = 0; + resetCommandTableStats(); addReply(c,shared.ok); } else { addReplyError(c,