Repository: couchdb
Updated Branches:
  refs/heads/master 4bd91069d -> 3e555b3c4


Improve healthcheck

* Only configure health check in the backend stanza
* Consider health check a failure on 404
* Point to /_up so we can set [couchdb] maintenance_mode (which causes
  /_up to return a 404)


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3e555b3c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3e555b3c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3e555b3c

Branch: refs/heads/master
Commit: 3e555b3c4cf8eb0d98cc2baf5941d472dd992857
Parents: 4bd9106
Author: Robert Newson <[email protected]>
Authored: Sun Jan 3 22:13:24 2016 +0000
Committer: Robert Newson <[email protected]>
Committed: Sun Jan 3 22:13:24 2016 +0000

----------------------------------------------------------------------
 rel/haproxy.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3e555b3c/rel/haproxy.cfg
----------------------------------------------------------------------
diff --git a/rel/haproxy.cfg b/rel/haproxy.cfg
index bf31630..73ec987 100644
--- a/rel/haproxy.cfg
+++ b/rel/haproxy.cfg
@@ -20,7 +20,6 @@ defaults
         monitor-uri /_haproxy_health_check
         option log-health-checks
         option httplog
-        option httpchk GET /?haproxy-check
         balance roundrobin
         option forwardfor
         option redispatch
@@ -41,6 +40,8 @@ frontend http-in
          default_backend couchdbs
 
 backend couchdbs
+        option httpchk GET /_up
+        http-check disable-on-404
         server couchdb1 127.0.0.1:15984 check inter 5s
         server couchdb2 127.0.0.1:25984 check inter 5s
         server couchdb3 127.0.0.1:35984 check inter 5s

Reply via email to