From: SATOH Fumiyasu <fumiyas@osstech.co.jp>
Date: Tue, 1 Jul 2014 10:22:56 +0000 (+0900)
Subject: lib-master: Set instance_name to the syslog name
X-Git-Tag: 2.3.9~1680
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b5b188c478ec36bea8bda8fcad1e5f32ac612b;p=thirdparty%2Fdovecot%2Fcore.git

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 5fee08a096..d7d13bc73f 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 2e1914e22b..e8c950d2b5 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -417,7 +417,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) {