From: Baofeng Wang <baofeng.wang@dovecot.fi>
Date: Wed, 20 Apr 2016 14:23:12 +0000 (+0300)
Subject: lib-storage: Add %{session} to mail_log_prefix by default
X-Git-Tag: 2.3.0.rc1~3792
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a11c0bcd4ad286b399053daf827735c39acdb9ec;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Add %{session} to mail_log_prefix by default

Parameter is added to initialization string.
---

diff --git a/doc/example-config/conf.d/10-logging.conf b/doc/example-config/conf.d/10-logging.conf
index 14798f1fd6..3eab39964c 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): "
+#mail_log_prefix = "%s(%u)<%{session}>: "
 
 # Format to use for logging mail deliveries. See doc/wiki/Variables.txt for
 # list of all variables you can use. Some of the common ones include:
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index ff02a1af3b..e158bbb1cb 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -276,7 +276,7 @@ static const struct mail_user_settings mail_user_default_settings = {
 	.mail_plugins = "",
 	.mail_plugin_dir = MODULEDIR,
 
-	.mail_log_prefix = "%s(%u): ",
+	.mail_log_prefix = "%s(%u)<%{session}>: ",
 
 	.namespaces = ARRAY_INIT,
 	.plugin_envs = ARRAY_INIT