[master] d43eebc Document the backend related VSL records.

Martin Blix Grydeland martin at varnish-cache.org
Thu Oct 31 12:21:09 CET 2013


commit d43eebc3de4df1fe04a1056521bd352ad3c13aff
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Oct 24 15:58:13 2013 +0200

    Document the backend related VSL records.
    
    Change what is logged in a couple of places for consistency.

diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index 2e10dcc..b3f17cf 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -54,7 +54,7 @@ VDI_CloseFd(struct vbc **vbp)
 
 	bp = vc->backend;
 
-	VSLb(vc->vsl, SLT_BackendClose, "%s", bp->display_name);
+	VSLb(vc->vsl, SLT_BackendClose, "%d %s", vc->fd, bp->display_name);
 
 	/*
 	 * Checkpoint log to flush all info related to this connection
@@ -86,7 +86,7 @@ VDI_RecycleFd(struct vbc **vbp)
 
 	bp = vc->backend;
 
-	VSLb(vc->vsl, SLT_BackendReuse, "%s", bp->display_name);
+	VSLb(vc->vsl, SLT_BackendReuse, "%d %s", vc->fd, bp->display_name);
 
 	/* XXX: revisit this hack */
 	VSL_Flush(vc->vsl, 0);
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 884a884..01ced35 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -113,12 +113,56 @@ SLTM(SessClose, "Client connection closed",
 
 /*---------------------------------------------------------------------*/
 
-SLTM(BackendOpen, "Backend connection opened", "")
-SLTM(BackendXID, "The unique ID of the backend transaction", "")
-SLTM(BackendReuse, "Backend connection reused", "")
-SLTM(BackendClose, "Backend connection closed", "")
+SLTM(BackendOpen, "Backend connection opened",
+	"Logged when a new backend connection is opened.\n\n"
+	"The format is::\n\n"
+	"\t%d %s %s %s\n"
+	"\t|  |  |  |\n"
+	"\t|  |  |  +- Remote port\n"
+	"\t|  |  +---- Remote address\n"
+	"\t|  +------- Backend display name\n"
+	"\t+---------- Connection file descriptor\n"
+	"\n"
+)
+
+SLTM(BackendXID, "The unique ID of the backend transaction (unused)", "")
+
+SLTM(BackendReuse, "Backend connection put up for reuse",
+	"Logged when a backend connection is put up for reuse by a later"
+	" connection.\n\n"
+	"The format is::\n\n"
+	"%d %s\n"
+	"|  |\n"
+	"|  +- Backend display name\n"
+	"+---- Connection file descriptor\n"
+	"\n"
+)
+
+SLTM(BackendClose, "Backend connection closed",
+	"Logged when a backend connection is closed.\n\n"
+	"The format is::\n\n"
+	"%d %s [ %s ]\n"
+	"|  |    |\n"
+	"|  |    +- Optional reason\n"
+	"|  +------ Backend display name\n"
+	"+--------- Connection file descriptor\n"
+	"\n"
+)
+
 SLTM(HttpGarbage, "", "")
-SLTM(Backend, "Backend selected", "")
+
+SLTM(Backend, "Backend selected",
+	"Logged when a connection is selected for handling a backend"
+	" request.\n\n"
+	"The format is::\n\n"
+	"\t%d %s %s\n"
+	"\t|  |  |\n"
+	"\t|  |  +- Backend display name\n"
+	"\t|  +---- VCL name\n"
+	"\t+------- Connection file descriptor\n"
+	"\n"
+)
+
 SLTM(Length, "Size of object body", "")
 
 SLTM(BereqEnd, "Backend request end",



More information about the varnish-commit mailing list