Adjust to vxid changes in varnish-cache

src/vmod_weightadjust.c

@@ -73,7 +73,7 @@ msg(VRT_CTX, const char *fmt, ...)
 		VSLbv(ctx->vsl, SLT_VCL_Error, fmt, args);
 	else
 		/* Should this ever happen in vcl_fini() ... */
-		VSL(SLT_VCL_Error, 0, fmt, args);
+		VSL(SLT_VCL_Error, NO_VXID, fmt, args);
 	va_end(args);
 }
 

src/wadj_thread.c

@@ -64,17 +64,17 @@ int VCP_Open(struct conn_pool *, vtim_dur tmo, VCL_IP *, int*);
 #include "wadj_thread.h"
 
 #define POKE_ERR(prop, fmt, ...)					  \
-	VSL(SLT_VCL_Error, 0, "vmod weightadjust error: poke %s.%s " fmt, \
+	VSL(SLT_VCL_Error, NO_VXID, "vmod weightadjust error: poke %s.%s " fmt, \
 	    (prop)->vd->dir->vcl_name, (prop)->be->vcl_name,	  \
 	    __VA_ARGS__)
 
 #define VPOKE_TRACE(prop, fmt, ...)					\
-	VSL(SLT_Debug, 0, "vmod weightadjust: poke %s.%s " fmt, 	\
+	VSL(SLT_Debug, NO_VXID, "vmod weightadjust: poke %s.%s " fmt, 	\
 	    (prop)->vd->dir->vcl_name, (prop)->be->vcl_name,	\
 	    __VA_ARGS__)
 
 #define POKE_TRACE(prop, str)					\
-	VSL(SLT_Debug, 0, "vmod weightadjust: poke %s.%s " str, \
+	VSL(SLT_Debug, NO_VXID, "vmod weightadjust: poke %s.%s " str, \
 	    (prop)->vd->dir->vcl_name, (prop)->be->vcl_name)
 
 /* largely copied from vbp_poke */

src/wadj_thread.h

@@ -27,6 +27,10 @@
  * SUCH DAMAGE.
  */
 
+#ifndef NO_VXID
+#define NO_VXID (0U)
+#endif
+
 enum run_state_e {
 	STOPPED	= 0,
 	STOPPING,