[experimental-ims] 158b428 Not sure what I was thinking: Have SLT_SessOpen log the fd#, not the xid, we already have that.

Poul-Henning Kamp phk at FreeBSD.org
Thu Dec 18 10:27:53 CET 2014


commit 158b428abfe2566c17eaf510bee2c4f4e1a1c0e7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 14 06:52:42 2012 +0000

    Not sure what I was thinking:  Have SLT_SessOpen log the fd#, not
    the xid, we already have that.

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index c7b9a4a..33c63ba 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -197,8 +197,8 @@ ses_vsl_socket(struct sess *sp, const char *lsockname)
 		strcpy(laddr, "-");
 		strcpy(lport, "-");
 	}
-	VSL(SLT_SessOpen, sp->vxid, "%u %s %s %s %s %s %.6f",
-	    sp->vxid, sp->addr, sp->port, lsockname, laddr, lport, sp->t_open);
+	VSL(SLT_SessOpen, sp->vxid, "%s %s %s %s %s %.6f %d",
+	    sp->addr, sp->port, lsockname, laddr, lport, sp->t_open, sp->fd);
 }
 
 /*--------------------------------------------------------------------
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index ae83bf7..9d970e1 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -73,6 +73,7 @@ SLTM(SessOpen, "Client connection opened",
 	"lsock\n    Listen socket\n\n"
 	"laddr\n    Local IPv4/6 address ('-' if !$log_local_addr)\n\n"
 	"lport\n    Local TCP port ('-' if !$log_local_addr)\n\n"
+	"fd\n    File descriptor number"
 )
 
 /*



More information about the varnish-commit mailing list