X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/bb831c313c32a64446484e66c275aaba55d2d818..52d46855d90bfddb3e03d957c48101d123e4dfe7:/src/config.c diff --git a/src/config.c b/src/config.c index d470dab1..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) { @@ -330,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")) { @@ -339,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); @@ -483,6 +501,18 @@ void configSetCommand(redisClient *c) { } 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); @@ -503,7 +533,7 @@ 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]; @@ -668,6 +698,20 @@ void configGetCommand(redisClient *c) { 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); }