change retry method to use recursion, raise exception if fails

diff --git a/macir.rb b/macir.rb
index 8331da423d5cca035828e87e62c819f66a0b9838..f923839db727d8174d42ecd81d6a3c998f3fa830 100644 (file)
--- a/macir.rb
+++ b/macir.rb
@@ -185,13 +185,14 @@ def wait_for_challenge_propagation(domain, challenge)
   threads.each(&:join)
 end
 
-def acme_request_with_retries
-  retries ||= 0
-  yield
+def acme_request_with_retries(retries: 5, &block)
+  p "Retries: #{retries}"
+  block.call(self)
 rescue Acme::Client::Error::BadNonce
-  retries += 1
+  raise unless retries.positive?
+
   p 'Retrying because of invalid nonce.'
-  retry if retries <= 5
+  acme_request_with_retries(retries: retries - 1, &block)
 end
 
 def wait_for_challenge_validation(challenge, cert_name)