master: Send instance_name setting to log process

This way log process can use it for syslog ident

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index fe5e5b01724386c69ab20d98c5feac861400f38b..b8d75b442763f473c6b3310e4c3b0684db889a72 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -8,6 +8,8 @@ struct setting_parser_context;
 struct master_service;
 
 struct master_service_settings {
+       /* NOTE: log process won't see any new settings unless they're
+          explicitly sent via environment variables by master process. */
        const char *base_dir;
        const char *state_dir;
        const char *instance_name;

diff --git a/src/master/service-process.c b/src/master/service-process.c
index 2770c75503483d49fc211e865872b98e896ac249..3baa991a47665f83719ae554a7067245c9e6b099 100644 (file)
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -224,6 +224,7 @@ static void service_process_setup_config_environment(struct service *service)
                env_put(t_strconcat("DEBUG_LOG_PATH=", set->debug_log_path, NULL));
                env_put(t_strconcat("LOG_TIMESTAMP=", set->log_timestamp, NULL));
                env_put(t_strconcat("SYSLOG_FACILITY=", set->syslog_facility, NULL));
+               env_put(t_strconcat("INSTANCE_NAME=", set->instance_name, NULL));
                if (set->verbose_proctitle)
                        env_put("VERBOSE_PROCTITLE=1");
                env_put("SSL=no");