Add <%{pid}> to default mail_log_prefix

It's especially useful nowadays when the same session ID can be reused by
multiple processes with IMAP hibernation enabled.

diff --git a/doc/example-config/conf.d/10-logging.conf b/doc/example-config/conf.d/10-logging.conf
index a377684d0305488bb7036a686ae101d0f5e69492..e0bcc8a1dab0d79ebbb2fa772b84324b54cf986a 100644 (file)
--- a/doc/example-config/conf.d/10-logging.conf
+++ b/doc/example-config/conf.d/10-logging.conf
@@ -72,7 +72,7 @@ plugin {
  
 # Log prefix for mail processes. See doc/wiki/Variables.txt for list of
 # possible variables you can use.
-#mail_log_prefix = "%s(%u)<%{session}>: "
+#mail_log_prefix = "%s(%u)<%{pid}><%{session}>: "
 
 # Format to use for logging mail deliveries:
 #  %$ - Delivery status message (e.g. "saved to INBOX")

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index fd5a20627065fbe5603d9a52dc72149528cf4e9e..8e2754b19762804201d92b50a51b57cad88d9fa3 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -284,7 +284,7 @@ static const struct mail_user_settings mail_user_default_settings = {
        .mail_plugins = "",
        .mail_plugin_dir = MODULEDIR,
 
-       .mail_log_prefix = "%s(%u)<%{session}>: ",
+       .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ",
 
        .namespaces = ARRAY_INIT,
        .plugin_envs = ARRAY_INIT