From b7b2f31c1cf6c1ff7fb3a088515b5a8e08a02103 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Mon, 2 Sep 2019 15:50:21 +0100
Subject: use utils.deadline() in utils.http.request, not raw sigalrm

---
 src/utils/http.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/http.py b/src/utils/http.py
index d63a99cc..f60cbbc6 100644
--- a/src/utils/http.py
+++ b/src/utils/http.py
@@ -73,24 +73,21 @@ def request(url: str, method: str="GET", get_params: dict={},
     if not "User-Agent" in headers:
         headers["User-Agent"] = USER_AGENT
 
-    signal.signal(signal.SIGALRM, lambda _1, _2: throw_timeout())
-    signal.alarm(5)
-    try:
-        response = requests.request(
-            method.upper(),
-            url,
-            headers=headers,
-            params=get_params,
-            data=post_data,
-            json=json_data,
-            allow_redirects=allow_redirects,
-            stream=True
-        )
-        response_content = response.raw.read(RESPONSE_MAX, decode_content=True)
-    except TimeoutError:
-        raise HTTPTimeoutException()
-    finally:
-        signal.signal(signal.SIGALRM, signal.SIG_IGN)
+    with utils.deadline(seconds=5):
+        try:
+            response = requests.request(
+                method.upper(),
+                url,
+                headers=headers,
+                params=get_params,
+                data=post_data,
+                json=json_data,
+                allow_redirects=allow_redirects,
+                stream=True
+            )
+            response_content = response.raw.read(RESPONSE_MAX, decode_content=True)
+        except DeadlineExceededException:
+            raise HTTPTimeoutException()
 
     response_headers = utils.CaseInsensitiveDict(dict(response.headers))
     content_type = response.headers.get("Content-Type", "").split(";", 1)[0]
-- 
cgit v1.3.1-10-gc9f91