}
} 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) {
}
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) {
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;
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;
} 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],"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) {
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;
}
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;
}
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 {
addReplyErrorFormat(c,"Unsupported CONFIG parameter: %s",
(char*)c->argv[2]->ptr);
int matches = 0;
redisAssert(o->encoding == REDIS_ENCODING_RAW);
+ 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);
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,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++;
+ }
setDeferredMultiBulkLength(c,replylen,matches*2);
}
server.stat_numcommands = 0;
server.stat_numconnections = 0;
server.stat_expiredkeys = 0;
+ resetCommandTableStats();
addReply(c,shared.ok);
} else {
addReplyError(c,
projects / redis.git / blobdiff