Skip to content

V
varnish-cache
Commit 9905baa5 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Minor polish.

parent 2376c076
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 9 deletions
bin/varnishd/cache/cache_backend_probe.c
View file @ 9905baa5
...@@ -181,9 +181,9 @@ VBP_Update_Backend(struct vbp_target *vt) ...@@ -181,9 +181,9 @@ VBP_Update_Backend(struct vbp_target *vt)
chg = (i != vt->backend->sick); chg = (i != vt->backend->sick);
vt->backend->sick = i; vt->backend->sick = i;
AN(dir->vcl_name); AN(vt->backend->vcl_name);
VSL(SLT_Backend_health, 0, "%s %s %s %s %u %u %u %.6f %.6f \"%s\"", VSL(SLT_Backend_health, 0, "%s %s %s %s %u %u %u %.6f %.6f \"%s\"",
dir->vcl_name, chg ? "Went" : "Still", vt->backend->vcl_name, chg ? "Went" : "Still",
i ? "sick" : "healthy", bits, i ? "sick" : "healthy", bits,
vt->good, vt->threshold, vt->window, vt->good, vt->threshold, vt->window,
vt->last, vt->avg, vt->resp_buf); vt->last, vt->avg, vt->resp_buf);
......
bin/varnishd/cache/cache_director.c
View file @ 9905baa5
...@@ -257,15 +257,11 @@ VRT_Healthy(VRT_CTX, VCL_BACKEND d, VCL_TIME *changed) ...@@ -257,15 +257,11 @@ VRT_Healthy(VRT_CTX, VCL_BACKEND d, VCL_TIME *changed)
VCL_VOID VCL_VOID
VRT_SetChanged(VCL_BACKEND d, VCL_TIME changed) VRT_SetChanged(VCL_BACKEND d, VCL_TIME changed)
{ {
if (d == NULL)
return;
CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC); CHECK_OBJ_ORNULL(d, DIRECTOR_MAGIC);
if (changed <= d->vdir->health_changed)
return;
d->vdir->health_changed = changed; if (d != NULL && changed > d->vdir->health_changed)
d->vdir->health_changed = changed;
} }
/* Send Event ---------------------------------------------------------- /* Send Event ----------------------------------------------------------
......
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