refactor: Improve certificate obtaining process with timeout and logging

yarlson · Oct 8, 2024 · 6bb5bc8 · 6bb5bc8
1 parent d50291e
commit 6bb5bc8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/main.go b/main.go
@@ -96,6 +96,7 @@ func run(cfg *Config) error {
 	}()
 
 	if certService.ShouldObtainCertificate(action, cert) {
+		log.Printf("Obtaining certificate for %s", cfg.Domain)
 		if err := certService.ObtainOrRenewCertificate(ctx, cfg.Domain, cfg.Email, certFile, keyFile); err != nil {
 			if errors.Is(err, context.Canceled) {
 				return errors.New("operation canceled")

diff --git a/zerossl/zerossl.go b/zerossl/zerossl.go
@@ -163,7 +163,10 @@ func (s *Service) ObtainCertificate(ctx context.Context, domain, email string) (
 		return nil, nil, nil, fmt.Errorf("accept challenge: %w", err)
 	}
 
-	order, err = client.WaitOrder(ctx, order.URI)
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, 1*time.Minute)
+	defer cancel()
+
+	order, err = client.WaitOrder(ctxWithTimeout, order.URI)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("wait for order: %w", err)
 	}