Merge branch 'dev' into 'dev'

Added more timeout exception checking to http_client.py.

See merge request pleroma/relay!48

relay.spec

@@ -9,7 +9,13 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=[],
-    hiddenimports=[],
+    hiddenimports=[
+        'aputils.enums',
+        'aputils.errors',
+        'aputils.misc',
+        'aputils.objects',
+        'aputils.signer'
+    ],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

relay/http_client.py

@@ -2,7 +2,8 @@ import logging
 import traceback
 
 from aiohttp import ClientSession, ClientTimeout, TCPConnector
-from aiohttp.client_exceptions import ClientConnectorError, ServerTimeoutError
+from aiohttp.client_exceptions import ClientConnectorError, ServerTimeoutError, ServerDisconnectedError
+from asyncio.exceptions import TimeoutError
 from aputils import Nodeinfo, WellKnownNodeinfo
 from datetime import datetime
 from cachetools import LRUCache
@@ -158,7 +159,7 @@ class HttpClient:
 				logging.verbose(f'Received error when pushing to {url}: {resp.status}')
 				return logging.verbose(await resp.read()) # change this to debug
 
-		except (ClientConnectorError, ServerTimeoutError):
+		except (ClientConnectorError, ServerTimeoutError, TimeoutError, ServerDisconnectedError):
 			logging.verbose(f'Failed to connect to {url}')
 
 		## prevent workers from being brought down