pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-22 14:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote_actor: cleanly catch exceptions while fetching actors

Browse source
This commit is contained in:
kaniini 2018-11-18 22:07:12 +00:00
parent e0d633b861
commit 69dfb04131
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
relay/remote_actor.py
View file

@ -1,3 +1,4 @@
import logging
import aiohttp import aiohttp
from . import CONFIG from . import CONFIG
from .http_debug import http_debug from .http_debug import http_debug
@ -15,7 +16,13 @@ async def fetch_actor(uri, force=False):
if uri in ACTORS and not force: if uri in ACTORS and not force:
return ACTORS[uri] return ACTORS[uri]
try:
async with aiohttp.ClientSession(trace_configs=[http_debug()]) as session: async with aiohttp.ClientSession(trace_configs=[http_debug()]) as session:
async with session.get(uri, headers={'Accept': 'application/activity+json'}) as resp: async with session.get(uri, headers={'Accept': 'application/activity+json'}) as resp:
if resp.status_code != 200:
return None
ACTORS[uri] = (await resp.json(encoding='utf-8', content_type=None)) ACTORS[uri] = (await resp.json(encoding='utf-8', content_type=None))
return ACTORS[uri] return ACTORS[uri]
except Exception as e:
logging.info('Caught %r while fetching actor %r.', e, uri)
return None