Unverified Commit a5fb7797 authored by Reza Naghibi's avatar Reza Naghibi Committed by Nils Goroll

Deprecate BackendReuse in favor of BackendClose

parent 0d4966b4
......@@ -242,7 +242,7 @@ vbe_dir_finish(VRT_CTX, VCL_BACKEND d)
Lck_Lock(&bp->mtx);
} else {
assert (PFD_State(pfd) == PFD_STATE_USED);
VSLb(bo->vsl, SLT_BackendReuse, "%d %s", *PFD_Fd(pfd),
VSLb(bo->vsl, SLT_BackendClose, "%d %s", *PFD_Fd(pfd),
VRT_BACKEND_string(bp->director));
Lck_Lock(&bp->mtx);
VSC_C_main->backend_recycle++;
......
......@@ -83,19 +83,19 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
expect 0 = ESI_xmlerror {^ERR after 843 ESI 1.0 <esi:include> has whitespace in src= attribute$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
logexpect l2 -v v1 -g vxid {
expect * * BereqURL {^/body$}
expect * = ESI_xmlerror {^ERR after 30 VEP ended inside a tag$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
logexpect l3 -v v1 -g vxid {
expect * * BereqURL {^/body2$}
expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
varnish v1 -cliok "param.set debug +esi_chop"
......
......@@ -63,7 +63,7 @@ logexpect l1 -v v1 -g vxid -q "vxid == 1002" {
expect 0 = ESI_xmlerror {^WARN after 107 ESI 1.0 <esi:include> lacks final '/'$}
expect 0 = ESI_xmlerror {^ERR after 130 ESI 1.0 <esi:bogus> element$}
expect 0 = ESI_xmlerror {^ERR after 131837 VEP ended inside a tag$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
client c1 {
......
......@@ -27,7 +27,7 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 <esi:include> element nested in <esi:remove>$}
expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 Nested <!--esi element in <esi:remove>$}
expect 0 = Gzip {^U}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
client c1 {
......
......@@ -33,7 +33,7 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 24 ESI 1.0 Nested <!--esi element in <esi:remove>$}
expect 0 = Gzip {^G}
expect 0 = Gzip {^U}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
client c1 {
......
......@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 = ESI_xmlerror {^ERR after 5 ESI 1.0 <esi:include> has multiple src= attributes$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
client c1 {
......
......@@ -27,7 +27,7 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 * ESI_xmlerror {^ERR after 66 ESI 1.0 Nested <!--esi element in <esi:remove>$}
expect 0 = BackendReuse
expect 0 = BackendClose
} -start
client c1 {
......
......@@ -24,11 +24,11 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
expect 0 = BackendReuse
expect 0 = BackendClose
# XXX another logexpect weirdness - why can't we catch the second occurrence?
# expect * * Fetch_Body
# expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
# expect 0 = BackendReuse
# expect 0 = BackendClose
} -start
client c1 {
......
......@@ -126,6 +126,7 @@ SLTM(BackendReuse, 0, "Backend connection put up for reuse",
"\t| +- Backend display name\n"
"\t+---- Connection file descriptor\n"
"\n"
NOSUP_NOTICE
)
SLTM(BackendClose, 0, "Backend connection closed",
......
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