From 170d8371226050e5d6ddc893815ad04e03fbfc11 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 8 Dec 2023 21:36:20 +0100 Subject: [PATCH] Increase retry count from 5 to 10. (#685) --- changelogs/fragments/685-acme-retry.yml | 2 ++ plugins/module_utils/acme/acme.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/685-acme-retry.yml diff --git a/changelogs/fragments/685-acme-retry.yml b/changelogs/fragments/685-acme-retry.yml new file mode 100644 index 00000000..fb76dccd --- /dev/null +++ b/changelogs/fragments/685-acme-retry.yml @@ -0,0 +1,2 @@ +bugfixes: + - "acme_* modules - increase number of retries from 5 to 10 to increase stability with unstable ACME endpoints (https://github.com/ansible-collections/community.crypto/pull/685)." diff --git a/plugins/module_utils/acme/acme.py b/plugins/module_utils/acme/acme.py index 8122d998..74d0bc1e 100644 --- a/plugins/module_utils/acme/acme.py +++ b/plugins/module_utils/acme/acme.py @@ -58,13 +58,16 @@ else: # -1 usually means connection problems RETRY_STATUS_CODES = (-1, 408, 429, 503) +RETRY_COUNT = 10 + def _decode_retry(module, response, info, retry_count): if info['status'] not in RETRY_STATUS_CODES: return False - if retry_count >= 5: - raise ACMEProtocolException(module, msg='Giving up after 5 retries', info=info, response=response) + if retry_count >= RETRY_COUNT: + raise ACMEProtocolException( + module, msg='Giving up after {retry} retries'.format(retry=RETRY_COUNT), info=info, response=response) # 429 and 503 should have a Retry-After header (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) try: