From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 16 Jan 2018 10:21:15 +0000 (+0200)
Subject: aggregator: Provide name for notify connection
X-Git-Tag: 2.4.0~3476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57138275daa40ff33d3deecf6cb11a5d20c5a34b;p=thirdparty%2Fdovecot%2Fcore.git

aggregator: Provide name for notify connection
---

diff --git a/src/replication/aggregator/aggregator.c b/src/replication/aggregator/aggregator.c
index 7a02d8f58d..8e213bfc6f 100644
--- a/src/replication/aggregator/aggregator.c
+++ b/src/replication/aggregator/aggregator.c
@@ -17,8 +17,14 @@ static struct event_category event_category_replication = {
 
 static void client_connected(struct master_service_connection *conn)
 {
+	const char *name;
+
 	master_service_client_connection_accept(conn);
-	notify_connection_create(conn->fd, conn->fifo);
+	if (conn->remote_port == 0)
+		name = conn->name;
+	else
+		name = net_ipport2str(&conn->remote_ip, conn->remote_port);
+	notify_connection_create(conn->fd, conn->fifo, name);
 }
 
 static void main_preinit(void)
diff --git a/src/replication/aggregator/notify-connection.c b/src/replication/aggregator/notify-connection.c
index 68dcfc9f87..6beb3d9338 100644
--- a/src/replication/aggregator/notify-connection.c
+++ b/src/replication/aggregator/notify-connection.c
@@ -114,7 +114,7 @@ static void notify_input(struct notify_connection *conn)
 	}
 }
 
-void notify_connection_create(int fd, bool fifo)
+void notify_connection_create(int fd, bool fifo, const char *name)
 {
 	struct notify_connection *conn;
 
@@ -123,8 +123,10 @@ void notify_connection_create(int fd, bool fifo)
 	conn->fd = fd;
 	conn->io = io_add(fd, IO_READ, notify_input, conn);
 	conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE);
+	i_stream_set_name(conn->input, name);
 	conn->event = event_create(NULL);
-	event_set_append_log_prefix(conn->event, "notify: ");
+	event_set_append_log_prefix(conn->event,
+		t_strdup_printf("notify(%s): ", name));
 	if (!fifo) {
 		conn->output = o_stream_create_fd(fd, SIZE_MAX);
 		o_stream_set_no_error_handling(conn->output, TRUE);
diff --git a/src/replication/aggregator/notify-connection.h b/src/replication/aggregator/notify-connection.h
index 790ae452e5..ba3b27b04e 100644
--- a/src/replication/aggregator/notify-connection.h
+++ b/src/replication/aggregator/notify-connection.h
@@ -1,7 +1,7 @@
 #ifndef NOTIFY_CONNECTION_H
 #define NOTIFY_CONNECTION_H
 
-void notify_connection_create(int fd, bool fifo);
+void notify_connection_create(int fd, bool fifo, const char *name);
 void notify_connections_destroy_all(void);
 
 void notify_connection_sync_callback(bool success, void *context);