[master] 55667f6 varnishstat: get uptime for averages even if not in filter

Nils Goroll nils.goroll at uplex.de
Fri Apr 6 15:20:13 UTC 2018


commit 55667f6a7485174a65c222e2e5fc876a5d6643bc
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Apr 6 17:18:19 2018 +0200

    varnishstat: get uptime for averages even if not in filter
    
    fixes #2639

diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 6b33e00..0a78a45 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -199,12 +199,17 @@ do_once_cb(void *priv, const struct VSC_point * const pt)
 static void
 do_once(struct vsm *vsm, struct vsc *vsc)
 {
+	struct vsc *vsconce = VSC_New();
 	struct once_priv op;
 
+	AN(vsconce);
+	AN(VSC_Arg(vsconce, 'f', "MAIN.uptime"));
+
 	memset(&op, 0, sizeof op);
 	op.pad = 18;
 
-	(void)VSC_Iter(vsc, vsm, do_once_cb_first, &op);
+	(void)VSC_Iter(vsconce, vsm, do_once_cb_first, &op);
+	VSC_Destroy(&vsconce, vsm);
 	(void)VSC_Iter(vsc, vsm, do_once_cb, &op);
 }
 


More information about the varnish-commit mailing list