From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 29 Jun 2016 15:33:27 +0000 (+0300)
Subject: dsync: Add session ID to log line prefix.
X-Git-Tag: 2.3.0.rc1~3387
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=034375aa3a0b51df052261a6064af31e3b54578a;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Add session ID to log line prefix.
---

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 0a5afb119f..94e1599c47 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -460,7 +460,7 @@ static void cmd_dsync_log_remote_status(int status, bool remote_errors_logged,
 
 static void cmd_dsync_run_remote(struct mail_user *user)
 {
-	i_set_failure_prefix("dsync-local(%s): ", user->username);
+	i_set_failure_prefix("dsync-local(%s)<%s>: ", user->username, user->session_id);
 	io_loop_run(current_ioloop);
 }
 
@@ -1108,7 +1108,7 @@ cmd_dsync_server_run(struct doveadm_mail_cmd_context *_ctx,
 	} else {
 		/* the log messages go via stderr to the remote dsync,
 		   so the names are reversed */
-		i_set_failure_prefix("dsync-remote(%s): ", user->username);
+		i_set_failure_prefix("dsync-remote(%s)<%s>: ", user->username, user->session_id);
 		name = "local";
 	}