From 9a71e969b59e8e3bf9ccb981f50a9b9327cf1f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 16 Sep 2020 14:51:47 +0100 Subject: [PATCH] remote: slightly improve debugging of socket selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current debug message reports the "mode" after selection has completed, however, the "mode" value can be changed by the selection logic. It is thus beneficial to report most values upfront, and only report newly changed values at the end. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrangé --- src/remote/remote_sockets.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c index 7c69ed9e7f..478c78edc2 100644 --- a/src/remote/remote_sockets.c +++ b/src/remote/remote_sockets.c @@ -145,6 +145,11 @@ remoteGetUNIXSocket(remoteDriverTransport transport, g_autofree char *direct_sock_name = NULL; g_autofree char *legacy_sock_name = NULL; + VIR_DEBUG("Choosing remote socket for transport=%s mode=%s driver=%s ro=%d session=%d", + remoteDriverTransportTypeToString(transport), + remoteDriverModeTypeToString(mode), + driver, ro, session); + if (driver) direct_daemon = g_strdup_printf("virt%sd", driver); @@ -208,12 +213,9 @@ remoteGetUNIXSocket(remoteDriverTransport transport, return NULL; } - VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s " - "for mode=%s transport=%s ro=%d session=%d", + VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s with mode=%s", sock_name, NULLSTR(*daemon), - remoteDriverModeTypeToString(mode), - remoteDriverTransportTypeToString(transport), - ro, session); + remoteDriverModeTypeToString(mode)); return sock_name; }