From 12c6e66fa47efa954e3a7b4bce48a026cf263704 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 7 Aug 2006 17:27:16 +0000 Subject: [PATCH] Rename SHMlog tags for consistency XID -> ReqStart ReqServTime -> ReqEnd git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@747 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/cache_acceptor.c | 2 +- varnish-cache/bin/varnishd/cache_center.c | 2 +- varnish-cache/include/shmlog_tags.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c index 8c8f4a5b..a4ffbdcd 100644 --- a/varnish-cache/bin/varnishd/cache_acceptor.c +++ b/varnish-cache/bin/varnishd/cache_acceptor.c @@ -88,7 +88,7 @@ vca_handover(struct sess *sp, int bad) sp->step = STP_RECV; VSL_stats->client_req++; sp->xid = xids++; - VSL(SLT_XID, sp->fd, "%u", sp->xid); + VSL(SLT_ReqStart, sp->fd, "XID %u", sp->xid); WRK_QueueSession(sp); } diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c index 8641e17f..b14eddee 100644 --- a/varnish-cache/bin/varnishd/cache_center.c +++ b/varnish-cache/bin/varnishd/cache_center.c @@ -106,7 +106,7 @@ cnt_done(struct sess *sp) dh = cnt_dt(&sp->t_open, &sp->t_req); dp = cnt_dt(&sp->t_req, &sp->t_resp); da = cnt_dt(&sp->t_resp, &te); - VSL(SLT_ReqServTime, sp->id, "%u %ld.%09ld %.9f %.9f %.9f", + VSL(SLT_ReqEnd, sp->id, "%u %ld.%09ld %.9f %.9f %.9f", sp->xid, (long)sp->t_req.tv_sec, (long)sp->t_req.tv_nsec, dh, dp, da); diff --git a/varnish-cache/include/shmlog_tags.h b/varnish-cache/include/shmlog_tags.h index d6181eea..c615231a 100644 --- a/varnish-cache/include/shmlog_tags.h +++ b/varnish-cache/include/shmlog_tags.h @@ -13,7 +13,7 @@ SLTM(Error) SLTM(CLI) SLTM(StatAddr) SLTM(StatSess) -SLTM(ReqServTime) +SLTM(ReqEnd) SLTM(SessionOpen) SLTM(SessionReuse) SLTM(SessionClose) @@ -56,7 +56,7 @@ SLTM(VCL_acl) SLTM(VCL_call) SLTM(VCL_trace) SLTM(VCL_return) -SLTM(XID) +SLTM(ReqStart) SLTM(Hit) SLTM(HitPass) SLTM(ExpBan) -- 2.39.5