r542 - in trunk/varnish-cache: bin/varnishd include

phk at projects.linpro.no phk at projects.linpro.no
Fri Jul 21 18:15:58 CEST 2006


Author: phk
Date: 2006-07-21 18:15:58 +0200 (Fri, 21 Jul 2006)
New Revision: 542

Modified:
   trunk/varnish-cache/bin/varnishd/rfc2616.c
   trunk/varnish-cache/include/shmlog_tags.h
Log:
Properly log TTL calculation to shmem


Modified: trunk/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/rfc2616.c	2006-07-21 16:06:07 UTC (rev 541)
+++ trunk/varnish-cache/bin/varnishd/rfc2616.c	2006-07-21 16:15:58 UTC (rev 542)
@@ -117,10 +117,12 @@
 
 		ttd = t_req + retirement_age;
 	}
-	VSL(SLT_Debug, fd,
-	    "TTD: max-age %u Age: %u Date: %d (%d) Expires %d (%d) our_clock %d"
-	    " -> ttd %d (%d)",
-	    u1, u2, h_date, h_date - t_req, h_expires, h_expires - t_req, t_req, ttd, ttd - t_req);
+
+	/* calculated TTL, Our time, Date, Expires, max-age, age */
+	VSL(SLT_TTL, fd, "%d %d %d %d %d %d",
+	    (int)(ttd - t_req), (int)t_req, (int)h_date, (int)h_expires,
+	    (int)u1, (int)u2);
+
 	return (ttd);
 }
 

Modified: trunk/varnish-cache/include/shmlog_tags.h
===================================================================
--- trunk/varnish-cache/include/shmlog_tags.h	2006-07-21 16:06:07 UTC (rev 541)
+++ trunk/varnish-cache/include/shmlog_tags.h	2006-07-21 16:15:58 UTC (rev 542)
@@ -32,6 +32,7 @@
 SLTM(RxHeader)
 SLTM(TxHeader)
 SLTM(LostHeader)
+SLTM(TTL)
 SLTM(VCL_call)
 SLTM(VCL_trace)
 SLTM(VCL_return)




More information about the varnish-commit mailing list