pkg/server/http: Allow passing http.ServeMux with a server option (#3769

) Signed-off-by: Matthias Loibl <[email protected]>
thanos-io · Feb 8, 2021 · ad2a53c · ad2a53c
1 parent 42888ab
commit ad2a53c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/server/http/http.go b/pkg/server/http/http.go
@@ -39,6 +39,10 @@ func New(logger log.Logger, reg *prometheus.Registry, comp component.Component,
 	}
 
 	mux := http.NewServeMux()
+	if options.mux != nil {
+		mux = options.mux
+	}
+
 	registerMetrics(mux, reg)
 	registerProbes(mux, prober, logger)
 	registerProfiler(mux)

diff --git a/pkg/server/http/option.go b/pkg/server/http/option.go
@@ -4,12 +4,14 @@
 package http
 
 import (
+	"net/http"
 	"time"
 )
 
 type options struct {
 	gracePeriod time.Duration
 	listen      string
+	mux         *http.ServeMux
 }
 
 // Option overrides behavior of Server.
@@ -38,3 +40,10 @@ func WithListen(s string) Option {
 		o.listen = s
 	})
 }
+
+// WithMux overrides the the server's default mux.
+func WithMux(mux *http.ServeMux) Option {
+	return optionFunc(func(o *options) {
+		o.mux = mux
+	})
+}