From 407cf68e593b50670219f767c4e3ece79368d74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 20 Jul 2023 20:03:20 +0800 Subject: [PATCH] Fix certmagic usage --- common/tls/acme.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/tls/acme.go b/common/tls/acme.go index cb447628..a881ace0 100644 --- a/common/tls/acme.go +++ b/common/tls/acme.go @@ -21,6 +21,7 @@ import ( type acmeWrapper struct { ctx context.Context cfg *certmagic.Config + cache *certmagic.Cache domain []string } @@ -29,7 +30,7 @@ func (w *acmeWrapper) Start() error { } func (w *acmeWrapper) Close() error { - w.cfg.Unmanage(w.domain) + w.cache.Stop() return nil } @@ -77,10 +78,11 @@ func startACME(ctx context.Context, options option.InboundACMEOptions) (*tls.Con acmeConfig.ExternalAccount = (*acme.EAB)(options.ExternalAccount) } config.Issuers = []certmagic.Issuer{certmagic.NewACMEIssuer(config, acmeConfig)} - config = certmagic.New(certmagic.NewCache(certmagic.CacheOptions{ + cache := certmagic.NewCache(certmagic.CacheOptions{ GetConfigForCert: func(certificate certmagic.Certificate) (*certmagic.Config, error) { return config, nil }, - }), *config) - return config.TLSConfig(), &acmeWrapper{ctx, config, options.Domain}, nil + }) + config = certmagic.New(cache, *config) + return config.TLSConfig(), &acmeWrapper{ctx: ctx, cfg: config, cache: cache, domain: options.Domain}, nil }