From 01c67c9e3872c67552e0ecdb5c3d08f40ba2b3d9 Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Tue, 1 Jul 2014 19:22:56 +0900 Subject: [PATCH] lib-master: Set instance_name to the syslog name --- src/lib-master/master-service-settings.c | 2 ++ src/lib-master/master-service-settings.h | 1 + src/lib-master/master-service.c | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index fcbcf7d15e..a302467658 100644 --- 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 e85c1245e8..5a1b560d1f 100644 --- 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 bf7e934c38..0d83694193 100644 --- 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) { -- 2.47.3