Unverified Commit b874c6f1 authored by Bjorn Svensson's avatar Bjorn Svensson Committed by GitHub
Browse files

Move config logfile to generic config (#9592)

Move config `logfile` to generic configs
parent 54d01e36
...@@ -556,9 +556,6 @@ void loadServerConfigFromString(char *config) { ...@@ -556,9 +556,6 @@ void loadServerConfigFromString(char *config) {
argv[1], strerror(errno)); argv[1], strerror(errno));
goto loaderr; goto loaderr;
} }
} else if (!strcasecmp(argv[0],"logfile") && argc == 2) {
zfree(server.logfile);
server.logfile = zstrdup(argv[1]);
} else if (!strcasecmp(argv[0],"include") && argc == 2) { } else if (!strcasecmp(argv[0],"include") && argc == 2) {
loadServerConfig(argv[1], 0, NULL); loadServerConfig(argv[1], 0, NULL);
} else if ((!strcasecmp(argv[0],"slaveof") || } else if ((!strcasecmp(argv[0],"slaveof") ||
...@@ -988,9 +985,6 @@ void configGetCommand(client *c) { ...@@ -988,9 +985,6 @@ void configGetCommand(client *c) {
} }
} }
/* String values */
config_get_string_field("logfile",server.logfile);
/* Numerical values */ /* Numerical values */
config_get_numerical_field("watchdog-period",server.watchdog_period); config_get_numerical_field("watchdog-period",server.watchdog_period);
...@@ -1806,7 +1800,6 @@ int rewriteConfig(char *path, int force_write) { ...@@ -1806,7 +1800,6 @@ int rewriteConfig(char *path, int force_write) {
rewriteConfigBindOption(state); rewriteConfigBindOption(state);
rewriteConfigOctalOption(state,"unixsocketperm",server.unixsocketperm,CONFIG_DEFAULT_UNIX_SOCKET_PERM); rewriteConfigOctalOption(state,"unixsocketperm",server.unixsocketperm,CONFIG_DEFAULT_UNIX_SOCKET_PERM);
rewriteConfigStringOption(state,"logfile",server.logfile,CONFIG_DEFAULT_LOGFILE);
rewriteConfigSaveOption(state); rewriteConfigSaveOption(state);
rewriteConfigUserOption(state); rewriteConfigUserOption(state);
rewriteConfigDirOption(state); rewriteConfigDirOption(state);
...@@ -2613,6 +2606,7 @@ standardConfig configs[] = { ...@@ -2613,6 +2606,7 @@ standardConfig configs[] = {
createStringConfig("ignore-warnings", NULL, MODIFIABLE_CONFIG, ALLOW_EMPTY_STRING, server.ignore_warnings, "", NULL, NULL), createStringConfig("ignore-warnings", NULL, MODIFIABLE_CONFIG, ALLOW_EMPTY_STRING, server.ignore_warnings, "", NULL, NULL),
createStringConfig("proc-title-template", NULL, MODIFIABLE_CONFIG, ALLOW_EMPTY_STRING, server.proc_title_template, CONFIG_DEFAULT_PROC_TITLE_TEMPLATE, isValidProcTitleTemplate, updateProcTitleTemplate), createStringConfig("proc-title-template", NULL, MODIFIABLE_CONFIG, ALLOW_EMPTY_STRING, server.proc_title_template, CONFIG_DEFAULT_PROC_TITLE_TEMPLATE, isValidProcTitleTemplate, updateProcTitleTemplate),
createStringConfig("bind-source-addr", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.bind_source_addr, NULL, NULL, NULL), createStringConfig("bind-source-addr", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.bind_source_addr, NULL, NULL, NULL),
createStringConfig("logfile", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.logfile, "", NULL, NULL),
/* SDS Configs */ /* SDS Configs */
createSDSConfig("masterauth", NULL, MODIFIABLE_CONFIG | SENSITIVE_CONFIG, EMPTY_STRING_IS_NULL, server.masterauth, NULL, NULL, NULL), createSDSConfig("masterauth", NULL, MODIFIABLE_CONFIG | SENSITIVE_CONFIG, EMPTY_STRING_IS_NULL, server.masterauth, NULL, NULL, NULL),
......
...@@ -3150,6 +3150,7 @@ void initServerConfig(void) { ...@@ -3150,6 +3150,7 @@ void initServerConfig(void) {
int j; int j;
char *default_bindaddr[CONFIG_DEFAULT_BINDADDR_COUNT] = CONFIG_DEFAULT_BINDADDR; char *default_bindaddr[CONFIG_DEFAULT_BINDADDR_COUNT] = CONFIG_DEFAULT_BINDADDR;
initConfigValues();
updateCachedTime(1); updateCachedTime(1);
getRandomHexChars(server.runid,CONFIG_RUN_ID_SIZE); getRandomHexChars(server.runid,CONFIG_RUN_ID_SIZE);
server.runid[CONFIG_RUN_ID_SIZE] = '\0'; server.runid[CONFIG_RUN_ID_SIZE] = '\0';
...@@ -3166,7 +3167,6 @@ void initServerConfig(void) { ...@@ -3166,7 +3167,6 @@ void initServerConfig(void) {
server.bindaddr_count = CONFIG_DEFAULT_BINDADDR_COUNT; server.bindaddr_count = CONFIG_DEFAULT_BINDADDR_COUNT;
for (j = 0; j < CONFIG_DEFAULT_BINDADDR_COUNT; j++) for (j = 0; j < CONFIG_DEFAULT_BINDADDR_COUNT; j++)
server.bindaddr[j] = zstrdup(default_bindaddr[j]); server.bindaddr[j] = zstrdup(default_bindaddr[j]);
server.bind_source_addr = NULL;
server.unixsocketperm = CONFIG_DEFAULT_UNIX_SOCKET_PERM; server.unixsocketperm = CONFIG_DEFAULT_UNIX_SOCKET_PERM;
server.ipfd.count = 0; server.ipfd.count = 0;
server.tlsfd.count = 0; server.tlsfd.count = 0;
...@@ -3176,7 +3176,6 @@ void initServerConfig(void) { ...@@ -3176,7 +3176,6 @@ void initServerConfig(void) {
server.saveparams = NULL; server.saveparams = NULL;
server.loading = 0; server.loading = 0;
server.loading_rdb_used_mem = 0; server.loading_rdb_used_mem = 0;
server.logfile = zstrdup(CONFIG_DEFAULT_LOGFILE);
server.aof_state = AOF_OFF; server.aof_state = AOF_OFF;
server.aof_rewrite_base_size = 0; server.aof_rewrite_base_size = 0;
server.aof_rewrite_scheduled = 0; server.aof_rewrite_scheduled = 0;
...@@ -3190,7 +3189,6 @@ void initServerConfig(void) { ...@@ -3190,7 +3189,6 @@ void initServerConfig(void) {
server.aof_fd = -1; server.aof_fd = -1;
server.aof_selected_db = -1; /* Make sure the first time will not match */ server.aof_selected_db = -1; /* Make sure the first time will not match */
server.aof_flush_postponed_start = 0; server.aof_flush_postponed_start = 0;
server.pidfile = NULL;
server.active_defrag_running = 0; server.active_defrag_running = 0;
server.notify_keyspace_events = 0; server.notify_keyspace_events = 0;
server.blocked_clients = 0; server.blocked_clients = 0;
...@@ -3213,7 +3211,6 @@ void initServerConfig(void) { ...@@ -3213,7 +3211,6 @@ void initServerConfig(void) {
appendServerSaveParams(60,10000); /* save after 1 minute and 10000 changes */ appendServerSaveParams(60,10000); /* save after 1 minute and 10000 changes */
/* Replication related */ /* Replication related */
server.masterauth = NULL;
server.masterhost = NULL; server.masterhost = NULL;
server.masterport = 6379; server.masterport = 6379;
server.master = NULL; server.master = NULL;
...@@ -3264,14 +3261,6 @@ void initServerConfig(void) { ...@@ -3264,14 +3261,6 @@ void initServerConfig(void) {
/* Debugging */ /* Debugging */
server.watchdog_period = 0; server.watchdog_period = 0;
/* By default we want scripts to be always replicated by effects
* (single commands executed by the script), and not by sending the
* script to the slave / AOF. This is the new way starting from
* Redis 5. However it is possible to revert it via redis.conf. */
server.lua_always_replicate_commands = 1;
initConfigValues();
} }
extern char **environ; extern char **environ;
......
...@@ -113,7 +113,6 @@ typedef long long ustime_t; /* microsecond time type. */ ...@@ -113,7 +113,6 @@ typedef long long ustime_t; /* microsecond time type. */
#define CONFIG_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */ #define CONFIG_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */
#define CONFIG_DEFAULT_PID_FILE "/var/run/redis.pid" #define CONFIG_DEFAULT_PID_FILE "/var/run/redis.pid"
#define CONFIG_DEFAULT_UNIX_SOCKET_PERM 0 #define CONFIG_DEFAULT_UNIX_SOCKET_PERM 0
#define CONFIG_DEFAULT_LOGFILE ""
#define CONFIG_DEFAULT_BINDADDR_COUNT 2 #define CONFIG_DEFAULT_BINDADDR_COUNT 2
#define CONFIG_DEFAULT_BINDADDR { "*", "-::*" } #define CONFIG_DEFAULT_BINDADDR { "*", "-::*" }
#define NET_HOST_STR_LEN 256 /* Longest valid hostname */ #define NET_HOST_STR_LEN 256 /* Longest valid hostname */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment