From cb46256394d271f1b60a146056e5acfc64e858d8 Mon Sep 17 00:00:00 2001 From: Nils Goroll Date: Mon, 29 Jan 2024 16:56:09 +0100 Subject: [PATCH] For BackendClose, also log the short tag as with SessClose this is for consistency, to simplify parsing and to reduce the amount of data logged with VSL. Motivated by #4042 --- bin/varnishd/cache/cache_backend.c | 2 +- include/tbl/vsl_tags.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c index 2a9e31edc9..e100c4b824 100644 --- a/bin/varnishd/cache/cache_backend.c +++ b/bin/varnishd/cache/cache_backend.c @@ -240,7 +240,7 @@ vbe_dir_finish(VRT_CTX, VCL_BACKEND d) bo->htc->priv = NULL; if (bo->htc->doclose != SC_NULL || bp->proxy_header != 0) { VSLb(bo->vsl, SLT_BackendClose, "%d %s close %s", *PFD_Fd(pfd), - VRT_BACKEND_string(d), bo->htc->doclose->desc); + VRT_BACKEND_string(d), bo->htc->doclose->name); VCP_Close(&pfd); AZ(pfd); Lck_Lock(bp->director->mtx); diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h index c94af34f25..0ff4c35de6 100644 --- a/include/tbl/vsl_tags.h +++ b/include/tbl/vsl_tags.h @@ -154,7 +154,7 @@ SLTM(BackendClose, 0, "Backend connection closed", "The format is::\n\n" "\t%d %s %s [ %s ]\n" "\t| | | |\n" - "\t| | | +- Optional reason\n" + "\t| | | +- Optional reason, see SessClose for explanation\n" "\t| | +------ \"close\" or \"recycle\"\n" "\t| +--------- Backend display name\n" "\t+------------ Connection file descriptor\n"