Mercurial > dovecot > core-2.2

changeset 22686:7347dab76be0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
director: DIRECTOR-LIST - Move connection/host output to their own functions
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Sun, 26 Nov 2017 12:26:27 +0200
parents b73e72db56b1
children e024078c62c9
files src/director/doveadm-connection.c
diffstat 1 files changed, 44 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/director/doveadm-connection.c	Sun Nov 26 12:36:54 2017 +0200
+++ b/src/director/doveadm-connection.c	Sun Nov 26 12:26:27 2017 +0200
@@ -209,6 +209,48 @@
 		    (long)status.last_output.tv_sec);
 }
 
+static void
+doveadm_director_connection_append(struct director *dir,
+				   struct director_connection *conn,
+				   const struct director_host *host,
+				   string_t *str)
+{
+	const char *type;
+
+	if (conn == dir->left)
+		type = "left";
+	else if (conn == dir->right)
+		type = "right";
+	else if (director_connection_is_incoming(conn))
+		type = "in";
+	else
+		type = "out";
+
+	if (host != NULL)
+		doveadm_director_host_append_status(host, type, str);
+	doveadm_director_connection_append_status(conn, str);
+	str_append_c(str, '\n');
+}
+
+static void
+doveadm_director_host_append(struct director *dir,
+			     const struct director_host *host, string_t *str)
+{
+	const char *type;
+
+	if (host->removed)
+		type = "removed";
+	else if (dir->self_host == host)
+		type = "self";
+	else
+		type = "";
+
+	doveadm_director_host_append_status(host, type, str);
+	if (dir->self_host == host)
+		doveadm_director_append_status(dir, str);
+	str_append_c(str, '\n');
+}
+
 static enum doveadm_director_cmd_ret
 doveadm_cmd_director_list(struct doveadm_connection *conn,
 			  const char *const *args ATTR_UNUSED)
@@ -216,7 +258,6 @@
 	struct director *dir = conn->dir;
 	struct director_host *const *hostp;
 	string_t *str = t_str_new(1024);
-	const char *type;
 	struct director_connection *const *connp;
 	ARRAY(struct director_host *) hosts;
 
@@ -236,36 +277,13 @@
 				break;
 			}
 		}
-		if (*connp == dir->left)
-			type = "left";
-		else if (*connp == dir->right)
-			type = "right";
-		else if (director_connection_is_incoming(*connp))
-			type = "in";
-		else
-			type = "out";
-
-		if (host != NULL)
-			doveadm_director_host_append_status(host, type, str);
-		doveadm_director_connection_append_status(*connp, str);
-		str_append_c(str, '\n');
+		doveadm_director_connection_append(dir, *connp, host, str);
 	}
 
 	/* show the rest of the hosts that don't have any connections */
 	array_foreach(&hosts, hostp) {
 		const struct director_host *host = *hostp;
-
-		if (host->removed)
-			type = "removed";
-		else if (dir->self_host == host)
-			type = "self";
-		else
-			type = "";
-
-		doveadm_director_host_append_status(host, type, str);
-		if (dir->self_host == host)
-			doveadm_director_append_status(dir, str);
-		str_append_c(str, '\n');
+		doveadm_director_host_append(dir, host, str);
 	}
 	str_append_c(str, '\n');
 	o_stream_nsend(conn->output, str_data(str), str_len(str));