master: Added instance_name setting, which is used to prefix processes in ps output.

diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf
index a557947cd33f8280567aaed1122d34a591b7648e..4a2d7963803c6ed17a44355c382a1d5e481162f0 100644 (file)
--- a/doc/example-config/dovecot.conf
+++ b/doc/example-config/dovecot.conf
@@ -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 --git a/src/master/main.c b/src/master/main.c
index d149be200cffb0cece95f01adb705dd196a615ab..82446f8f028949c8f5e20e169d365580e08a25a2 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -79,7 +79,8 @@ void process_exec(const char *cmd, const char *extra_args[])
        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 --git a/src/master/master-settings.c b/src/master/master-settings.c
index e00b5c949153ae8e3eb8f28159f4e9d2f559d714..190de1051436ee69d8007b671f3f712146ec6163 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -172,6 +172,7 @@ const struct setting_parser_info service_setting_parser_info = {
 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 setting_define master_setting_defines[] = {
 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 --git a/src/master/master-settings.h b/src/master/master-settings.h
index 3c7cfccc2ccce8a06fb3322a0b985451004e11fd..bc94270b579cd22d374310a7d33c6b21c53cc0e7 100644 (file)
--- a/src/master/master-settings.h
+++ b/src/master/master-settings.h
@@ -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;