server: Split metrics and health code

Signed-off-by: Siyuan Zhang <sizhang@google.com>
This commit is contained in:
Marek Siarkowicz
2022-01-27 19:04:41 +01:00
committed by Siyuan Zhang
parent cc44646a2e
commit 4a8381a461
6 changed files with 241 additions and 224 deletions

View File

@@ -773,7 +773,8 @@ func (e *Etcd) serveClients() (err error) {
} else {
mux := http.NewServeMux()
etcdhttp.HandleBasic(mux, e.Server)
etcdhttp.HandleMetricsHealth(mux, e.Server)
etcdhttp.HandleMetrics(mux)
etcdhttp.HandleHealth(mux, e.Server)
h = mux
}
@@ -862,7 +863,8 @@ func (e *Etcd) serveMetrics() (err error) {
if len(e.cfg.ListenMetricsUrls) > 0 {
metricsMux := http.NewServeMux()
etcdhttp.HandleMetricsHealth(metricsMux, e.Server)
etcdhttp.HandleMetrics(metricsMux)
etcdhttp.HandleHealth(metricsMux, e.Server)
for _, murl := range e.cfg.ListenMetricsUrls {
tlsInfo := &e.cfg.ClientTLSInfo