cmd/thanos/receive: Serve TLS when TLSConfig is given (#2311)

squat · mrIncompetent · web-flow · commit 65b49afed409 · 2020-03-24T13:50:46.000+01:00
Signed-off-by: mrIncompetent &lt;henrik@henrik-schmidt.de&gt;
Signed-off-by: Lucas Servén Marín &lt;lserven@gmail.com&gt;

Co-authored-by: mrIncompetent &lt;henrik@henrik-schmidt.de&gt;
diff --git a/pkg/receive/handler.go b/pkg/receive/handler.go
@@ -191,6 +191,13 @@ func (h *Handler) Run() error {
 		TLSConfig: h.options.TLSConfig,
 	}
 
+	if h.options.TLSConfig != nil {
+		level.Info(h.logger).Log("msg", "Serving HTTPS", "address", h.options.ListenAddress)
+		// Cert & Key are already being passed in via TLSConfig.
+		return httpSrv.ServeTLS(h.listener, "", "")
+	}
+
+	level.Info(h.logger).Log("msg", "Serving plain HTTP", "address", h.options.ListenAddress)
 	return httpSrv.Serve(h.listener)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,13 @@ func (h *Handler) Run() error {`
`191`	`191`	`TLSConfig: h.options.TLSConfig,`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ if h.options.TLSConfig != nil {`
	`195`	`+ level.Info(h.logger).Log("msg", "Serving HTTPS", "address", h.options.ListenAddress)`
	`196`	`+ // Cert & Key are already being passed in via TLSConfig.`
	`197`	`+ return httpSrv.ServeTLS(h.listener, "", "")`
	`198`	`+ }`
	`199`	`+`
	`200`	`+ level.Info(h.logger).Log("msg", "Serving plain HTTP", "address", h.options.ListenAddress)`
`194`	`201`	`return httpSrv.Serve(h.listener)`
`195`	`202`	`}`
`196`	`203`