Properly log TTL calculation to shmem

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@542 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index fbf1cf4bac11de11a626d53809b518cb04d5acb0..f20ca5ee2531986a408cfb5552c822eca21650a0 100644 (file)
--- 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 e481216eac5e7c66fee392cfb513859708b898bd..78f5a13888759749bed92a457f2c1333eb9c0520 100644 (file)
--- 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)