X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/0ec932208e6a3162955de1fe75efd0346439f005..afd0f06b755ff53ce91d1dabeca959655590d3f0:/src/config.c diff --git a/src/config.c b/src/config.c index 9d30d985..9f71aaf6 100644 --- a/src/config.c +++ b/src/config.c @@ -73,6 +73,12 @@ void loadServerConfig(char *filename) { 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,6 +194,18 @@ 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) { @@ -251,18 +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],"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],"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) { @@ -308,6 +314,14 @@ void loadServerConfig(char *filename) { } 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; } @@ -334,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")) { @@ -343,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); @@ -478,6 +492,27 @@ void configSetCommand(redisClient *c) { } 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); @@ -498,17 +533,16 @@ 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]; - addReplyBulkCString(c,"dir"); - if (getcwd(buf,sizeof(buf)) == NULL) { + if (getcwd(buf,sizeof(buf)) == NULL) buf[0] = '\0'; - } else { - addReplyBulkCString(c,buf); - } + + addReplyBulkCString(c,"dir"); + addReplyBulkCString(c,buf); matches++; } if (stringmatch(pattern,"dbfilename",0)) { @@ -649,6 +683,35 @@ void configGetCommand(redisClient *c) { 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); }