Merge 95a24a2 into 1502e8d

release-engineering · Aug 31, 2021 · cf57677 · cf57677
2 parents 1502e8d + 95a24a2
commit cf57677
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ubipop/_pulp_client.py b/ubipop/_pulp_client.py
@@ -17,6 +17,7 @@
 
 HTTP_TOTAL_RETRIES = int(os.environ.get("UBIPOP_HTTP_TOTAL_RETRIES", 10))
 HTTP_RETRY_BACKOFF = float(os.environ.get("UBIPOP_HTTP_RETRY_BACKOFF", 1))
+HTTP_TIMEOUT = int(os.environ.get("UBIPOP_HTTP_TIMEOUT", 60))
 
 
 class UnsupportedTypeId(Exception):
@@ -77,9 +78,13 @@ def do_request(self, req_type, url, data=None):
         req_url = urljoin(self.base_url, url)
 
         if req_type == "post":
-            ret = self.local.session.post(req_url, json=data, verify=not self.insecure)
+            ret = self.local.session.post(
+                req_url, json=data, verify=not self.insecure, timeout=HTTP_TIMEOUT
+            )
         elif req_type == "get":
-            ret = self.local.session.get(req_url, verify=not self.insecure)
+            ret = self.local.session.get(
+                req_url, verify=not self.insecure, timeout=HTTP_TIMEOUT
+            )
         else:
             ret = None