[4.1] f99ec68 Fix varnishtest barrier error messages

Lasse Karstensen lkarsten at varnish-software.com
Tue Jun 14 11:19:09 CEST 2016


commit f99ec6844118844d505ff2c4a595882e75b5cfbb
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Mar 31 16:45:29 2016 +0200

    Fix varnishtest barrier error messages
    
    Spotted by @fgsch

diff --git a/bin/varnishtest/vtc_barrier.c b/bin/varnishtest/vtc_barrier.c
index ecd3ba5..f0becfa 100644
--- a/bin/varnishtest/vtc_barrier.c
+++ b/bin/varnishtest/vtc_barrier.c
@@ -325,7 +325,7 @@ barrier_sock_sync(struct barrier *b, struct vtclog *vl)
 	AZ(close(sock));
 
 	if (sz < 0)
-		vtc_log(vl, 0, "Barrier(%s) connection failed: %s (errno=%d)",
+		vtc_log(vl, 0, "Barrier(%s) read failed: %s (errno=%d)",
 		    b->name, strerror(i), i);
 	if (sz > 0)
 		vtc_log(vl, 0, "Barrier(%s) unexpected data (%ldB)",
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 2ebefd3..f014715 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -505,7 +505,7 @@ vmod_barrier_sync(VRT_CTX, VCL_STRING addr)
 		return (1);
 	if (sz < 0)
 		VSLb(ctx->vsl, SLT_Error,
-		    "Barrier connection failed: %s (errno=%d)", strerror(i), i);
+		    "Barrier read failed: %s (errno=%d)", strerror(i), i);
 	if (sz > 0)
 		VSLb(ctx->vsl, SLT_Error, "Barrier unexpected data (%ldB)", sz);
 	return (0);



More information about the varnish-commit mailing list