Merge pull request #422 from rcorex/fix-http-timeout

Add timeout to HTTP requests

Author: mcarlton00

resources/lib/jellyfin.py

@@ -37,8 +37,8 @@ def get(self, path):
 
         url = '{}{}'.format(self.server, path)
 
-        r = requests.get(url, headers=self.headers, verify=self.verify_cert)
         try:
+            r = requests.get(url, headers=self.headers, verify=self.verify_cert, timeout=(5,60))
             try:
                 '''
                 The requests library defaults to using simplejson to handle
@@ -51,7 +51,7 @@ def get(self, path):
                 response_data = json.loads(r.text)
             except ValueError:
                 response_data = r.json()
-        except:  # noqa
+        except Exception:
             response_data = {}
         return response_data
 
@@ -61,14 +61,14 @@ def post(self, url, payload={}):
 
         url = '{}{}'.format(self.server, url)
 
-        r = requests.post(url, json=payload, headers=self.headers, verify=self.verify_cert)
         try:
+            r = requests.post(url, json=payload, headers=self.headers, verify=self.verify_cert, timeout=5)
             try:
                 # Much faster on low power devices, see above comment
                 response_data = json.loads(r.text)
             except ValueError:
                 response_data = r.json()
-        except:  # noqa
+        except Exception:
             response_data = {}
         return response_data
 
@@ -78,7 +78,10 @@ def delete(self, url):
 
         url = '{}{}'.format(self.server, url)
 
-        requests.delete(url, headers=self.headers, verify=self.verify_cert)
+        try:
+            requests.delete(url, headers=self.headers, verify=self.verify_cert, timeout=5)
+        except Exception:
+            pass
 
     def authenticate(self, auth_data):
         # Always force create fresh headers during authentication