From: Timo Sirainen Date: Wed, 20 Sep 2017 16:09:58 +0000 (+0300) Subject: Add <%{pid}> to default mail_log_prefix X-Git-Tag: 2.3.0.rc1~972 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dcf98a55df71b11c2cac4c20232b07e49606a9a;p=thirdparty%2Fdovecot%2Fcore.git 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 a377684d03..e0bcc8a1da 100644 --- 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 fd5a206270..8e2754b197 100644 --- 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