Merge branch 'sqldatabase' into 'master'

Draft: Use SQL database backend

See merge request pleroma/relay!47

relay/http_client.py

@@ -2,8 +2,7 @@ import logging
 import traceback
 
 from aiohttp import ClientSession, ClientTimeout, TCPConnector
-from aiohttp.client_exceptions import ClientConnectionError, ClientSSLError
+from aiohttp.client_exceptions import ClientConnectorError, ServerTimeoutError
-from asyncio.exceptions import TimeoutError as AsyncTimeoutError
 from aputils import Nodeinfo, WellKnownNodeinfo
 from datetime import datetime
 from cachetools import LRUCache
@@ -144,14 +143,12 @@ class HttpClient(AppBase):
 		except JSONDecodeError:
 			logging.verbose(f'Failed to parse JSON')
 
-		except ClientSSLError:
+		except (ClientConnectorError, ServerTimeoutError):
-			logging.verbose(f'SSL error when connecting to {urlparse(url).netloc}')
-
-		except (AsyncTimeoutError, ClientConnectionError):
 			logging.verbose(f'Failed to connect to {urlparse(url).netloc}')
 
 		except Exception as e:
 			traceback.print_exc()
+			raise e
 
 
 	async def post(self, inbox, message):

requirements.txt

@@ -3,4 +3,4 @@ aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.3.tar.gz
 cachetools>=5.2.0
 click>=8.1.2
 pyyaml>=6.0
-tinysql[all]@https://git.barkshark.xyz/barkshark/tinysql/archive/0.1.0.tar.gz
+tinysql[postgres,mysql]@https://git.barkshark.xyz/barkshark/tinysql/archive/0.1.0.tar.gz