lib-master: Set instance_name to the syslog name

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index fcbcf7d15ee1ad77c7f20c58d4e1e7d7f030ff0d..a302467658359c2d7eea7b6dbf2fc16c4977c4d6 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -39,6 +39,7 @@ master_service_settings_check(void *_set, pool_t pool, const char **error_r);
 static const struct setting_define master_service_setting_defines[] = {
        DEF(SET_STR, base_dir),
        DEF(SET_STR, state_dir),
+       DEF(SET_STR, instance_name),
        DEF(SET_STR, log_path),
        DEF(SET_STR, info_log_path),
        DEF(SET_STR, debug_log_path),
@@ -75,6 +76,7 @@ static const struct setting_define master_service_setting_defines[] = {
 static const struct master_service_settings master_service_default_settings = {
        .base_dir = PKG_RUNDIR,
        .state_dir = PKG_STATEDIR,
+       .instance_name = PACKAGE,
        .log_path = "syslog",
        .info_log_path = "",
        .debug_log_path = "",

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index e85c1245e825f3321b1cf62cef7f0381615b657b..5a1b560d1f42be77e7c9fdaab8842e35a22e31d9 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -10,6 +10,7 @@ struct master_service;
 struct master_service_settings {
        const char *base_dir;
        const char *state_dir;
+       const char *instance_name;
        const char *log_path;
        const char *info_log_path;
        const char *debug_log_path;

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index bf7e934c38b32d22cc024b2fda3ae6d068401524..0d836941938efeb0e11f31b46acfd03018843e66 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -423,7 +423,8 @@ master_service_try_init_log(struct master_service *service,
                if (!syslog_facility_find(service->set->syslog_facility,
                                          &facility))
                        facility = LOG_MAIL;
-               i_set_failure_syslog("dovecot", LOG_NDELAY, facility);
+               i_set_failure_syslog(service->set->instance_name, LOG_NDELAY,
+                                    facility);
                i_set_failure_prefix("%s", prefix);
 
                if (strcmp(service->set->log_path, "syslog") != 0) {