Hi Willy, please consider applying this series which adds support for a secondary health check and removes support for the recently added lb-agent-chk.
This series is a revised subset of "[PATCH v6 00/22] Agent Check Enhancements and External Check". It builds on patches from that series that have already been applied. To aid review this series is available in git at https://github.com/horms/haproxy.git/agent-check-v7 To further aid review, my working version of the fuller patch-set, based on this patchset, is available at https://github.com/horms/haproxy/tree/http-agent-and-external-check-v7.snapshot.20141125 Simon Horman (9): MEDIUM: Add helper for task creation for checks MEDIUM: Add helper function for failed checks MEDIUM: Log agent fail, stopped or down as info MEDIUM: Remove option lb-agent-chk MEDIUM: checks: Add supplementary agent checks MEDIUM: Do not mark a server as down if the agent is unavailable MEDIUM: Set rise and fall of agent checks to 1 MEDIUM: Add enable and disable agent unix socket commands MEDIUM: Add DRAIN state and report it on the stats page doc/configuration.txt | 169 +++++++++++++++++++++++++++-------------- include/common/defaults.h | 2 + include/proto/server.h | 12 +++ include/types/server.h | 14 +++- src/cfgparse.c | 104 ++++++++++++++++++++----- src/checks.c | 189 +++++++++++++++++++++++++++++----------------- src/dumpstats.c | 75 +++++++++++++----- src/haproxy.c | 6 ++ src/proto_http.c | 2 +- src/server.c | 2 +- 10 files changed, 407 insertions(+), 168 deletions(-) -- 1.8.4
