[master] 426183e improve FetchError message

Nils Goroll nils.goroll at uplex.de
Wed Feb 17 14:34:05 CET 2016


commit 426183e3003db5819a891ae0324e5dc2d5f015ed
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Feb 17 14:34:01 2016 +0100

    improve FetchError message

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index c210bd3..2f44dcd 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -540,7 +540,7 @@ vbf_fetch_body_helper(struct busyobj *bo)
 #define vbf_vfp_push(bo, vfp, top)					\
 	if (VFP_Push((bo)->vfc, (vfp), (top)) == NULL) {		\
 		assert (WS_Overflowed((bo)->vfc->http->ws));		\
-		(void)VFP_Error((bo)->vfc, "Bo workspace overflowed");	\
+		(void)VFP_Error((bo)->vfc, "workspace_backend overflow"); \
 		(bo)->htc->doclose = SC_OVERLOAD;			\
 		VDI_Finish((bo)->wrk, bo);				\
 		return (F_STP_ERROR);					\
diff --git a/bin/varnishtest/tests/r01739.vtc b/bin/varnishtest/tests/r01739.vtc
index 5b80f1e..21398cc 100644
--- a/bin/varnishtest/tests/r01739.vtc
+++ b/bin/varnishtest/tests/r01739.vtc
@@ -16,7 +16,7 @@ varnish v1 \
 } -start
 
 logexpect l1 -v v1 -g raw {
-	expect * 1002 FetchError {^Bo workspace overflowed}
+	expect * 1002 FetchError {^workspace_backend overflow}
 	expect * =    Error      {^out of workspace [(]Bo[)]}
 } -start
 



More information about the varnish-commit mailing list