Merge branch 'fix/get-certificate-ctx' into 'master'

fix: propagate context during certificate retrieval

See merge request gitlab-org/gitlab-pages!777

1 files changed, 1 insertions, 5 deletions

diff --git a/app.go b/app.go
index c733668f..c08dfb29 100644
--- a/app.go
+++ b/app.go
@@ -62,7 +62,7 @@ func (a *theApp) GetCertificate(ch *cryptotls.ClientHelloInfo) (*cryptotls.Certi
 		return nil, nil
 	}
 
-	if domain, _ := a.domain(context.Background(), ch.ServerName); domain != nil {
+	if domain, _ := a.source.GetDomain(ch.Context(), ch.ServerName); domain != nil {
 		certificate, _ := domain.EnsureCertificate()
 		return certificate, nil
 	}
@@ -84,10 +84,6 @@ func (a *theApp) getTLSConfig() (*cryptotls.Config, error) {
 	return a.tlsConfig, err
 }
 
-func (a *theApp) domain(ctx context.Context, host string) (*domain.Domain, error) {
-	return a.source.GetDomain(ctx, host)
-}
-
 // serveFileOrNotFoundHandler will serve static content or
 // return a 404 Not Found response
 func (a *theApp) serveFileOrNotFoundHandler() http.Handler {