dovecot-2.1: master: Added instance_name setting, which is used ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/e1f21a4ef417
changeset: 13972:e1f21a4ef417
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 20 18:59:16 2012 +0200
description:
master: Added instance_name setting, which is used to prefix processes in ps output.

diffstat:

 doc/example-config/dovecot.conf |  3 +++
 src/master/main.c               |  3 ++-
 src/master/master-settings.c    |  2 ++
 src/master/master-settings.h    |  1 +
 4 files changed, 8 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r a817cfc3979d -r e1f21a4ef417 doc/example-config/dovecot.conf
--- a/doc/example-config/dovecot.conf	Fri Jan 20 18:44:49 2012 +0200
+++ b/doc/example-config/dovecot.conf	Fri Jan 20 18:59:16 2012 +0200
@@ -28,6 +28,9 @@
 # Base directory where to store runtime data.
 #base_dir = /var/run/dovecot/
 
+# Name of this instance. Used to prefix all Dovecot processes in ps output.
+#instance_name = dovecot
+
 # Greeting message for clients.
 #login_greeting = Dovecot ready.
 
diff -r a817cfc3979d -r e1f21a4ef417 src/master/main.c
--- a/src/master/main.c	Fri Jan 20 18:44:49 2012 +0200
+++ b/src/master/main.c	Fri Jan 20 18:59:16 2012 +0200
@@ -79,7 +79,8 @@
 	if (p != NULL) argv[0] = p+1;
 
 	/* prefix with dovecot/ */
-	argv[0] = t_strconcat(PACKAGE"/", argv[0], NULL);
+	argv[0] = t_strdup_printf("%s/%s", services->set->instance_name,
+				  argv[0]);
 	(void)execv_const(executable, argv);
 }
 
diff -r a817cfc3979d -r e1f21a4ef417 src/master/master-settings.c
--- a/src/master/master-settings.c	Fri Jan 20 18:44:49 2012 +0200
+++ b/src/master/master-settings.c	Fri Jan 20 18:59:16 2012 +0200
@@ -172,6 +172,7 @@
 static const struct setting_define master_setting_defines[] = {
 	DEF(SET_STR, base_dir),
 	DEF(SET_STR, libexec_dir),
+	DEF(SET_STR, instance_name),
 	DEF(SET_STR, import_environment),
 	DEF(SET_STR, protocols),
 	DEF(SET_STR, listen),
@@ -211,6 +212,7 @@
 static const struct master_settings master_default_settings = {
 	.base_dir = PKG_RUNDIR,
 	.libexec_dir = PKG_LIBEXECDIR,
+	.instance_name = PACKAGE,
 	.import_environment = "TZ" ENV_SYSTEMD ENV_GDB,
 	.protocols = "imap pop3 lmtp",
 	.listen = "*, ::",
diff -r a817cfc3979d -r e1f21a4ef417 src/master/master-settings.h
--- a/src/master/master-settings.h	Fri Jan 20 18:44:49 2012 +0200
+++ b/src/master/master-settings.h	Fri Jan 20 18:59:16 2012 +0200
@@ -6,6 +6,7 @@
 struct master_settings {
 	const char *base_dir;
 	const char *libexec_dir;
+	const char *instance_name;
 	const char *import_environment;
 	const char *protocols;
 	const char *listen;