pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-09-19 15:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: pch_xyz:a1ac043d7232af97fd629e02bb55b8e36e8f4eff
Branches Tags
pch_xyz:master
pch_xyz:dev
pch_xyz:main
pch_xyz:0.3.2
pch_xyz:0.3.1
pch_xyz:0.3.0
pch_xyz:0.2.6
pch_xyz:0.2.5
pch_xyz:0.2.4
pch_xyz:0.2.3
pch_xyz:0.2.2
pch_xyz:0.2.1
pch_xyz:0.2.0
pch_xyz:0.1.0
...
compare: pch_xyz:97e9f1a2fd61fee0b6bbc44c935cb56842896bac
Branches Tags
pch_xyz:dev
pch_xyz:main
pch_xyz:master
pch_xyz:0.3.2
pch_xyz:0.3.1
pch_xyz:0.3.0
pch_xyz:0.2.6
pch_xyz:0.2.5
pch_xyz:0.2.4
pch_xyz:0.2.3
pch_xyz:0.2.2
pch_xyz:0.2.1
pch_xyz:0.2.0
pch_xyz:0.1.0

5 commits
a1ac043d72 ... 97e9f1a2fd

Author SHA1 Message Date
Izalia Mae 97e9f1a2fd Merge branch 'sqldatabase' into 'master' 
Draft: Use SQL database backend

See merge request pleroma/relay!47
 2023-01-04 15:24:17 +00:00
Izalia Mae b73e43a9ff Merge branch 'master' into sqldatabase 2022-12-29 07:28:14 -05:00
Izalia Mae f4698aa4dc fix RuntimeError when running commands involving http client 2022-12-29 07:27:35 -05:00
Izalia Mae 76c678b215 fix tinysql optional deps 2022-12-26 05:57:45 -05:00
Izalia Mae 0940921383 handle more client connection errors 2022-12-26 02:02:57 -05:00
2 changed files with 7 additions and 4 deletions
Show stats Expand all files Collapse all files

9
relay/http_client.py
View file

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

2
requirements.txt
View file

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