diff --git a/acme/acme.go b/acme/acme.go index 4ec96dd83..bd128a25a 100644 --- a/acme/acme.go +++ b/acme/acme.go @@ -253,7 +253,6 @@ func (a *ACME) CreateLocalConfig(tlsConfig *tls.Config, checkOnDemandDomain func needRegister = true } - log.Infof("buildACMEClient...") a.client, err = a.buildACMEClient(account) if err != nil { return err @@ -271,7 +270,7 @@ func (a *ACME) CreateLocalConfig(tlsConfig *tls.Config, checkOnDemandDomain func // The client has a URL to the current Let's Encrypt Subscriber // Agreement. The user will need to agree to it. - log.Infof("AgreeToTOS...") + log.Debugf("AgreeToTOS...") err = a.client.AgreeToTOS() if err != nil { // Let's Encrypt Subscriber Agreement renew ? @@ -375,11 +374,6 @@ func (a *ACME) renewCertificates() error { account := a.store.Get().(*Account) for _, certificateResource := range account.DomainsCertificate.Certs { if certificateResource.needRenew() { - transaction, object, err := a.store.Begin() - if err != nil { - return err - } - account = object.(*Account) log.Debugf("Renewing certificate %+v", certificateResource.Domains) renewedCert, err := a.client.RenewCertificate(acme.CertificateResource{ Domain: certificateResource.Certificate.Domain, @@ -400,6 +394,11 @@ func (a *ACME) renewCertificates() error { PrivateKey: renewedCert.PrivateKey, Certificate: renewedCert.Certificate, } + transaction, object, err := a.store.Begin() + if err != nil { + return err + } + account = object.(*Account) err = account.DomainsCertificate.renewCertificates(renewedACMECert, certificateResource.Domains) if err != nil { log.Errorf("Error renewing certificate: %v", err)