@@ -11,7 +11,6 @@ import (
1111
1212 "github.com/bloom42/stdx-go/db"
1313 "github.com/bloom42/stdx-go/log/slogx"
14- "github.com/bloom42/stdx-go/memorycache"
1514 "github.com/bloom42/stdx-go/set"
1615 "golang.org/x/crypto/acme/autocert"
1716 "markdown.ninja/cmd/mdninja-server/config"
@@ -31,7 +30,7 @@ type CertManager struct {
3130 kms * kms.Kms
3231 kernel kernel.Service
3332
34- cache * memorycache.Cache [string , * tls.Certificate ]
33+ // cache *memorycache.Cache[string, *tls.Certificate]
3534 autocertManager * autocert.Manager
3635}
3736
@@ -62,10 +61,10 @@ func NewCertManager(ctx context.Context, db db.DB, kms *kms.Kms,
6261 autocertDomains .Insert (fmt .Sprintf ("www.%s" , httpConfig .WebappDomain ))
6362 autocertDomains .Insert (httpConfig .WebsitesRootDomain )
6463
65- certsCache := memorycache .New (
66- memorycache.WithCapacity [string , * tls.Certificate ](1_000 ),
67- memorycache.WithTTL [string , * tls.Certificate ](1 * time .Hour ),
68- )
64+ // certsCache := memorycache.New(
65+ // memorycache.WithCapacity[string, *tls.Certificate](1_000),
66+ // memorycache.WithTTL[string, *tls.Certificate](1*time.Hour),
67+ // )
6968
7069 certManager = & CertManager {
7170 db : db ,
@@ -75,8 +74,8 @@ func NewCertManager(ctx context.Context, db db.DB, kms *kms.Kms,
7574 autocertManager : autocertManager ,
7675 websitesService : websitesService ,
7776 httpConfig : httpConfig ,
78- cache : certsCache ,
79- kernel : kernel ,
77+ // cache: certsCache,
78+ kernel : kernel ,
8079 }
8180
8281 // go func() {
@@ -116,16 +115,16 @@ func (certManager *CertManager) DefaultCertificate() *tls.Certificate {
116115
117116func (certManager * CertManager ) GetCertificate (clientHello * tls.ClientHelloInfo ) (* tls.Certificate , error ) {
118117 if certManager .isAllowedDomain (context .Background (), clientHello .ServerName ) {
119- if cachedCert := certManager .cache .Get (clientHello .ServerName ); cachedCert != nil {
120- return cachedCert .Value (), nil
121- }
118+ // if cachedCert := certManager.cache.Get(clientHello.ServerName); cachedCert != nil {
119+ // return cachedCert.Value(), nil
120+ // }
122121
123122 cert , err := certManager .autocertManager .GetCertificate (clientHello )
124123 if err != nil {
125124 return cert , err
126125 }
127126
128- certManager .cache .Set (clientHello .ServerName , cert , memorycache .DefaultTTL )
127+ // certManager.cache.Set(clientHello.ServerName, cert, memorycache.DefaultTTL)
129128 return cert , nil
130129 }
131130
@@ -184,7 +183,7 @@ func (certManager *CertManager) Put(ctx context.Context, key string, data []byte
184183func (certManager * CertManager ) Delete (ctx context.Context , key string ) error {
185184 logger := slogx .FromCtx (ctx )
186185
187- certManager .cache .Delete (key )
186+ // certManager.cache.Delete(key)
188187 _ , err := certManager .db .Exec (ctx , "DELETE FROM tls_certificates WHERE key = $1" , key )
189188 if err != nil {
190189 err = fmt .Errorf ("certmanager.Delete: error deleting tls_certificate: %w" , err )
0 commit comments