From 7b8236e6db017896a4fc0b8874899add15232f60 Mon Sep 17 00:00:00 2001
From: Logan Williams <logan@bellingcat.com>
Date: Tue, 12 Apr 2022 14:55:05 +0200
Subject: [PATCH] No recursive retries

---
 cisticola/utils.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/cisticola/utils.py b/cisticola/utils.py
index 385884f..5a5a9bf 100644
--- a/cisticola/utils.py
+++ b/cisticola/utils.py
@@ -31,21 +31,15 @@ def make_request(url, headers = None, max_retries = 5, break_codes = None):
 
     r = None
 
-    for n_retries in range(max_retries):
-        try:
-            r = request_until_200(
-                url = url, 
-                headers = headers, 
-                max_retries = max_retries,
-                break_codes = break_codes)
-            logger.debug(f"Request for url: {url} succeeded on attempt: {n_retries}/{max_retries}")
-        except Exception as e:
-            logger.warning(f"Request for url: {url} raised exception: [{e}] on attempt: {n_retries}/{max_retries}")
-            continue 
-        else:
-            break 
-    else:
-        logger.error(f"Request for url: {url} failed after {max_retries} attempts")
+    try:
+        r = request_until_200(
+            url = url, 
+            headers = headers, 
+            max_retries = max_retries,
+            break_codes = break_codes)
+        logger.debug(f"Request for url: {url} succeeded")
+    except Exception as e:
+        logger.warning(f"Request for url: {url} raised exception: [{e}]")
 
     return r