From 1ebeec10fd2e0b7e0be40801227511d468a754cf Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 21 Jul 2006 16:15:58 +0000 Subject: [PATCH] Properly log TTL calculation to shmem git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@542 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/rfc2616.c | 10 ++++++---- varnish-cache/include/shmlog_tags.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c index fbf1cf4b..f20ca5ee 100644 --- a/varnish-cache/bin/varnishd/rfc2616.c +++ b/varnish-cache/bin/varnishd/rfc2616.c @@ -117,10 +117,12 @@ RFC2616_Ttl(int fd, struct http *hp, time_t t_req, time_t t_resp, struct object 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); } diff --git a/varnish-cache/include/shmlog_tags.h b/varnish-cache/include/shmlog_tags.h index e481216e..78f5a138 100644 --- a/varnish-cache/include/shmlog_tags.h +++ b/varnish-cache/include/shmlog_tags.h @@ -32,6 +32,7 @@ SLTM(Protocol) SLTM(RxHeader) SLTM(TxHeader) SLTM(LostHeader) +SLTM(TTL) SLTM(VCL_call) SLTM(VCL_trace) SLTM(VCL_return) -- 2.39.5