From: Sergey Kitov <sergey.kitov@open-xchange.com>
Date: Wed, 12 Dec 2018 14:21:29 +0000 (+0200)
Subject: log: Use failure context log_prefix when available as prefix for error.
X-Git-Tag: 2.3.5~287
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17b2694839279a0f090f7502aed6f3827a007855;p=thirdparty%2Fdovecot%2Fcore.git

log: Use failure context log_prefix when available as prefix for error.

Current behaviour hides log prefix when seeing errors via doveadm log
errors, this commit will fix it.
---

diff --git a/src/log/log-connection.c b/src/log/log-connection.c
index 9db19b4859..3c700a34d2 100644
--- a/src/log/log-connection.c
+++ b/src/log/log-connection.c
@@ -139,7 +139,7 @@ client_log_ctx(struct log_connection *log,
 		i_zero(&err);
 		err.type = ctx->type;
 		err.timestamp = log_time->tv_sec;
-		err.prefix = prefix;
+		err.prefix = ctx->log_prefix != NULL ? ctx->log_prefix : prefix;
 		err.text = text;
 		log_error_buffer_add(log->errorbuf, &err);
 		break;