From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 10 Apr 2020 22:26:25 +0000 (+0200)
Subject: master: test-master-login-auth - Add log prefixes to distinguish client and server... 
X-Git-Tag: 2.3.13~591
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aaa25c6a00374592ef67872ec6fe9ea6bd1927d;p=thirdparty%2Fdovecot%2Fcore.git

master: test-master-login-auth - Add log prefixes to distinguish client and server debug messages.
---

diff --git a/src/master/test-master-login-auth.c b/src/master/test-master-login-auth.c
index 6a1ee09cd9..4d15241ae2 100644
--- a/src/master/test-master-login-auth.c
+++ b/src/master/test-master-login-auth.c
@@ -913,9 +913,10 @@ test_run_client_server(test_client_init_t *client_test,
 				io_loop_destroy(&ioloop);
 			}
 			lib_signals_deinit();
-			if (debug)
-				i_debug("server: PID=%s", my_pid);
 			/* child: server */
+			i_set_failure_prefix("SERVER: ");
+			if (debug)
+				i_debug("PID=%s", my_pid);
 			ioloop = io_loop_create();
 			server_test();
 			io_loop_destroy(&ioloop);
@@ -928,13 +929,14 @@ test_run_client_server(test_client_init_t *client_test,
 		}
 		if (fd_listen != -1)
 			i_close_fd(&fd_listen);
-		if (debug)
-			i_debug("client: PID=%s", my_pid);
 
 		lib_signals_ioloop_attach();
 	}
 
 	/* parent: client */
+	i_set_failure_prefix("CLIENT: ");
+	if (debug)
+		i_debug("PID=%s", my_pid);
 
 	usleep(100000); /* wait a little for server setup */
 
@@ -944,6 +946,7 @@ test_run_client_server(test_client_init_t *client_test,
 	test_client_deinit();
 	io_loop_destroy(&ioloop);
 
+	i_unset_failure_prefix();
 	test_server_kill();
 	i_unlink_if_exists(TEST_SOCKET);
 }