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 14798f1fd68709fcedc4ed2260b353fc0dd20431..3eab39964ca2946a14ce6964cc23e4b78a8ff12a 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): "
+#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 ff02a1af3b10614e3ba6ed2a1d3939dd2f16f607..e158bbb1cb1bad79cb7bff57080dad7525018ebc 100644 (file)
--- 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