From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 31 Aug 2018 11:54:18 +0000 (+0300)
Subject: log: Avoid unnecessary global log prefix changes
X-Git-Tag: 2.3.9~1470
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d95e05bbf679a727874e5173e6261b098884eb91;p=thirdparty%2Fdovecot%2Fcore.git

log: Avoid unnecessary global log prefix changes

If the context specifies a log prefix, the global prefix isn't going to be
used.
---

diff --git a/src/log/log-connection.c b/src/log/log-connection.c
index db268ff6e1..8677043478 100644
--- a/src/log/log-connection.c
+++ b/src/log/log-connection.c
@@ -145,9 +145,13 @@ client_log_ctx(struct log_connection *log,
 	case LOG_TYPE_COUNT:
 		i_unreached();
 	}
-	i_set_failure_prefix("%s", prefix);
+	/* log_prefix overrides the global prefix. Don't bother changing the
+	   global prefix in that case. */
+	if (ctx->log_prefix == NULL)
+		i_set_failure_prefix("%s", prefix);
 	i_log_type(ctx, "%s", text);
-	i_set_failure_prefix("%s", global_log_prefix);
+	if (ctx->log_prefix == NULL)
+		i_set_failure_prefix("%s", global_log_prefix);
 }
 
 static void