update to current master

README.rst

@@ -269,4 +269,3 @@ COPYRIGHT
  
   Author: Geoffrey Simmons <geoffrey.simmons@uplex.de>
  
-

src/vmod_health.c

@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include "vrt.h"
 #include "cache/cache.h"
 #include "cache/cache_director.h"
 #include "cache/cache_backend.h"
@@ -71,42 +70,27 @@ vmod_probe_healthy(VRT_CTX, VCL_BACKEND d)
 	CAST_OBJ(b, d->priv, BACKEND_MAGIC);
 	if (b->probe == NULL) {
 		FAIL(ctx, "Backend %s has no health probe", d->vcl_name);
-		return 0;
+		return (0);
 	}
-	return(b->healthy);
+	return (d->health);
 }
 
 VCL_STRING
 vmod_admin_health(VRT_CTX, VCL_BACKEND d)
 {
-	struct backend *b;
-
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	if (d->priv == NULL) {
-		NOTABACKEND(ctx, d);
-		return NULL;
-	}
+	(void) ctx;
 
-	CAST_OBJ(b, d->priv, BACKEND_MAGIC);
-	AN(b->admin_health);
-	return(b->admin_health);
+	return (VDI_Ahealth(d));
 }
 
 VCL_TIME
 vmod_health_changed(VRT_CTX, VCL_BACKEND d)
 {
-	struct backend *b;
-
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	if (d->priv == NULL) {
-		NOTABACKEND(ctx, d);
-		return 0.;
-	}
+	double changed;
+	(void) ctx;
 
-	CAST_OBJ(b, d->priv, BACKEND_MAGIC);
-	return(b->health_changed);
+	VDI_Healthy(d, &changed);
+	return (changed);
 }
 
 VCL_STRING