Commit b21b0d7b authored by Federico G. Schwindt's avatar Federico G. Schwindt

Ident and type are optional

Update the code to accommodate this.  Originally reported by Reinis
Rozitis (r at roze.lv) on varnish-misc.

Fixes #2118.
parent 5db29013
......@@ -24,3 +24,7 @@ shell "grep -q mempool ${tmpdir}/p2/stdout"
err_shell "" "grep -q LCK.vbe.destroy ${tmpdir}/p2/stdout"
shell "cmp -s ${tmpdir}/p1/stdout ${tmpdir}/p2/stdout"
process p3 {varnishstat -1 -n ${v1_name} -f MAIN.cache_hit} -run
shell "grep -q cache_hit ${tmpdir}/p3/stdout"
......@@ -379,10 +379,13 @@ vsc_filter_pt_list(struct VSM_data *vd)
VTAILQ_FOREACH_SAFE(pt, &vsc->pt_list, list, pt2) {
CHECK_OBJ_NOTNULL(pt, VSC_PT_MAGIC);
VSB_clear(vsb);
VSB_printf(vsb, "%s.%s.%s",
pt->point.section->type,
pt->point.section->ident,
pt->point.desc->name);
if (strcmp(pt->point.section->type, ""))
VSB_printf(vsb, "%s.",
pt->point.section->type);
if (strcmp(pt->point.section->ident, ""))
VSB_printf(vsb, "%s.",
pt->point.section->ident);
VSB_printf(vsb, "%s", pt->point.desc->name);
VSB_finish(vsb);
if (fnmatch(sf->pattern, VSB_data(vsb), 0))
continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment