Mercurial > dovecot > core-2.2
changeset 22485:ca38a4e36fad
master: Move import_environment setting to lib-master's master_service_settings
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 08 Jun 2017 00:14:30 +0300 |
| parents | 71589abee915 |
| children | fe8060e2ad47 |
| files | src/lib-master/master-service-settings.c src/lib-master/master-service-settings.h src/master/main.c src/master/master-settings.c src/master/master-settings.h |
| diffstat | 5 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-master/master-service-settings.c Mon Sep 11 12:27:17 2017 +0300 +++ b/src/lib-master/master-service-settings.c Thu Jun 08 00:14:30 2017 +0300 @@ -42,6 +42,7 @@ DEF(SET_STR, debug_log_path), DEF(SET_STR, log_timestamp), DEF(SET_STR, syslog_facility), + DEF(SET_STR, import_environment), DEF(SET_SIZE, config_cache_size), DEF(SET_BOOL, version_ignore), DEF(SET_BOOL, shutdown_clients), @@ -53,6 +54,19 @@ SETTING_DEFINE_LIST_END }; +/* <settings checks> */ +#ifdef HAVE_SYSTEMD +# define ENV_SYSTEMD " LISTEN_PID LISTEN_FDS" +#else +# define ENV_SYSTEMD "" +#endif +#ifdef DEBUG +# define ENV_GDB " GDB DEBUG_SILENT" +#else +# define ENV_GDB "" +#endif +/* </settings checks> */ + static const struct master_service_settings master_service_default_settings = { .base_dir = PKG_RUNDIR, .state_dir = PKG_STATEDIR, @@ -61,6 +75,7 @@ .debug_log_path = "", .log_timestamp = DEFAULT_FAILURE_STAMP_FORMAT, .syslog_facility = "mail", + .import_environment = "TZ CORE_OUTOFMEM CORE_ERROR" ENV_SYSTEMD ENV_GDB, .config_cache_size = 1024*1024, .version_ignore = FALSE, .shutdown_clients = TRUE,
--- a/src/lib-master/master-service-settings.h Mon Sep 11 12:27:17 2017 +0300 +++ b/src/lib-master/master-service-settings.h Thu Jun 08 00:14:30 2017 +0300 @@ -15,6 +15,7 @@ const char *debug_log_path; const char *log_timestamp; const char *syslog_facility; + const char *import_environment; uoff_t config_cache_size; bool version_ignore; bool shutdown_clients;
--- a/src/master/main.c Mon Sep 11 12:27:17 2017 +0300 +++ b/src/master/main.c Thu Jun 08 00:14:30 2017 +0300 @@ -421,7 +421,8 @@ return master_service_settings_get_others(master_service)[0]; } -static void master_set_import_environment(const struct master_settings *set) +static void +master_set_import_environment(const struct master_service_settings *set) { const char *const *envs, *key, *value; ARRAY_TYPE(const_string) keys; @@ -845,7 +846,7 @@ fatal_log_check(set); T_BEGIN { - master_set_import_environment(set); + master_set_import_environment(master_service_settings_get(master_service)); } T_END; master_service_env_clean();
--- a/src/master/master-settings.c Mon Sep 11 12:27:17 2017 +0300 +++ b/src/master/master-settings.c Thu Jun 08 00:14:30 2017 +0300 @@ -178,7 +178,6 @@ DEF(SET_STR, state_dir), DEF(SET_STR, libexec_dir), DEF(SET_STR, instance_name), - DEF(SET_STR, import_environment), DEF(SET_STR, protocols), DEF(SET_STR, listen), DEF(SET_ENUM, ssl), @@ -201,25 +200,11 @@ SETTING_DEFINE_LIST_END }; -/* <settings checks> */ -#ifdef HAVE_SYSTEMD -# define ENV_SYSTEMD " LISTEN_PID LISTEN_FDS" -#else -# define ENV_SYSTEMD "" -#endif -#ifdef DEBUG -# define ENV_GDB " GDB DEBUG_SILENT" -#else -# define ENV_GDB "" -#endif -/* </settings checks> */ - static const struct master_settings master_default_settings = { .base_dir = PKG_RUNDIR, .state_dir = PKG_STATEDIR, .libexec_dir = PKG_LIBEXECDIR, .instance_name = PACKAGE, - .import_environment = "TZ CORE_OUTOFMEM CORE_ERROR" ENV_SYSTEMD ENV_GDB, .protocols = "imap pop3 lmtp", .listen = "*, ::", .ssl = "yes:no:required",
--- a/src/master/master-settings.h Mon Sep 11 12:27:17 2017 +0300 +++ b/src/master/master-settings.h Thu Jun 08 00:14:30 2017 +0300 @@ -8,7 +8,6 @@ const char *state_dir; const char *libexec_dir; const char *instance_name; - const char *import_environment; const char *protocols; const char *listen; const char *ssl;