From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 14 Sep 2017 14:33:19 +0000 (+0300)
Subject: director: Cleanup - move code to a new director_log_connect()
X-Git-Tag: 2.3.0.rc1~1017
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9d302dceba09ceefa0aaddf7eafafd760cd1736;p=thirdparty%2Fdovecot%2Fcore.git

director: Cleanup - move code to a new director_log_connect()

Also adds a missing ')' to the log line.
---

diff --git a/src/director/director.c b/src/director/director.c
index 0167a38120..bcddbb6547 100644
--- a/src/director/director.c
+++ b/src/director/director.c
@@ -125,6 +125,24 @@ director_has_outgoing_connection(struct director *dir,
 	return FALSE;
 }
 
+static void
+director_log_connect(struct director *dir, struct director_host *host)
+{
+	string_t *str = t_str_new(128);
+
+	if (host->last_network_failure > 0) {
+		str_printfa(str, ", last network failure %ds ago",
+			    (int)(ioloop_time - host->last_network_failure));
+	}
+	if (host->last_protocol_failure > 0) {
+		str_printfa(str, ", last protocol failure %ds ago",
+			    (int)(ioloop_time - host->last_protocol_failure));
+	}
+	dir_debug("Connecting to %s:%u (as %s%s)",
+		  net_ip2addr(&host->ip), host->port,
+		  net_ip2addr(&dir->self_ip), str_c(str));
+}
+
 int director_connect_host(struct director *dir, struct director_host *host)
 {
 	in_port_t port;
@@ -133,22 +151,8 @@ int director_connect_host(struct director *dir, struct director_host *host)
 	if (director_has_outgoing_connection(dir, host))
 		return 0;
 
-	if (director_debug) {
-		string_t *str = t_str_new(128);
-
-		str_printfa(str, "Connecting to %s:%u (as %s",
-			    net_ip2addr(&host->ip), host->port,
-			    net_ip2addr(&dir->self_ip));
-		if (host->last_network_failure > 0) {
-			str_printfa(str, ", last network failure %ds ago",
-				    (int)(ioloop_time - host->last_network_failure));
-		}
-		if (host->last_protocol_failure > 0) {
-			str_printfa(str, ", last protocol failure %ds ago",
-				    (int)(ioloop_time - host->last_protocol_failure));
-		}
-		dir_debug("%s", str_c(str));
-	}
+	if (director_debug)
+		director_log_connect(dir, host);
 	port = dir->test_port != 0 ? dir->test_port : host->port;
 	fd = net_connect_ip(&host->ip, port, &dir->self_ip);
 	if (fd == -1) {