Continued:

[fba.git] / fba / http / network.py

diff --git a/fba/http/network.py b/fba/http/network.py
index 00a31e4476494f991e1a6a12de1d67abb2d5e994..58d44af14119cf21ed1a9580a636742a7fd46028 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -89,7 +89,7 @@ def post_json_api(domain: str, path: str, data: str = "", headers: dict = dict()
 
         logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text))
         if not response.ok or response.status_code >= 300 or len(response.text.strip()) == 0:
-            logger.warning("Cannot query JSON API: domain='%s',path='%s',data()=%d,response.status_code=%d,response.text()=%d", domain, path, len(data), response.status_code, len(response.text))
+            logger.debug("Cannot query JSON API: domain='%s',path='%s',data()=%d,response.status_code=%d,response.text()=%d", domain, path, len(data), response.status_code, len(response.text))
             json_reply["status_code"]   = response.status_code
             json_reply["error_message"] = response.reason
             instances.set_last_error(domain, response)
@@ -183,7 +183,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
 
     logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text))
     if not response.ok or response.status_code >= 300 or len(response.text) == 0:
-        logger.warning("Cannot query JSON API: domain='%s',path='%s',response.status_code=%d,response.text()=%d", domain, path, response.status_code, len(response.text))
+        logger.debug("Cannot query JSON API: domain='%s',path='%s',response.status_code=%d,response.text()=%d", domain, path, response.status_code, len(response.text))
         json_reply["status_code"]   = response.status_code
         json_reply["error_message"] = response.reason
         instances.set_last_error(domain, response)
@@ -238,8 +238,8 @@ def send_bot_post(domain: str, blocklist: list):
 
     return True
 
-def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> requests.models.Response:
-    logger.debug("domain='%s',path='%s',headers()=%d,timeout='%s' - CALLED!", domain, path, len(headers), timeout)
+def fetch_response(domain: str, path: str, headers: dict, timeout: tuple, allow_redirects: bool = False) -> requests.models.Response:
+    logger.debug("domain='%s',path='%s',headers()=%d,timeout='%s',allow_redirects='%s' - CALLED!", domain, path, len(headers), timeout, allow_redirects)
     domain_helper.raise_on(domain)
 
     if not isinstance(path, str):
@@ -258,7 +258,7 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> req
             headers=headers,
             timeout=timeout,
             cookies=cookies.get_all(domain),
-            allow_redirects=False
+            allow_redirects=allow_redirects
         )
 
     except exceptions as exception: