[master] 6cb6dfe9f vtc_server: Disambiguate "shutting fd" logs

Nils Goroll nils.goroll at uplex.de
Tue May 20 09:12:05 UTC 2025


commit 6cb6dfe9f3d914b94e1f31d766244cbffc8f0c21
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon May 6 14:27:56 2024 +0200

    vtc_server: Disambiguate "shutting fd" logs

diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 45913aaa7..5de00896a 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -265,7 +265,7 @@ server_disc(void *priv, struct vtclog *vl, int *fdp)
 	struct server *s;
 
 	CAST_OBJ_NOTNULL(s, priv, SERVER_MAGIC);
-	vtc_log(vl, 3, "shutting fd %d", *fdp);
+	vtc_log(vl, 3, "shutting fd %d (server run)", *fdp);
 	j = shutdown(*fdp, SHUT_WR);
 	if (!vtc_stop && !VTCP_Check(j))
 		vtc_fatal(vl, "Shutdown failed: %s", strerror(errno));
@@ -322,7 +322,7 @@ server_dispatch_wrk(void *priv)
 
 	vtc_log(vl, 3, "start with fd %d", fd);
 	fd = sess_process(vl, s->vsp, s->spec, fd, &s->sock, s->listen);
-	vtc_log(vl, 3, "shutting fd %d", fd);
+	vtc_log(vl, 3, "shutting fd %d (server dispatch)", fd);
 	j = shutdown(fd, SHUT_WR);
 	if (!VTCP_Check(j))
 		vtc_fatal(vl, "Shutdown failed: %s", strerror(errno));


More information about the varnish-commit mailing list