Merge branch 'dev' into 'main'

version 0.3.3

See merge request pleroma/relay!59

relay/cache.py

@@ -243,11 +243,10 @@ class SqlCache(Cache):
 		if self._db is None:
 			raise RuntimeError("Database has not been setup")
 
-		limit = Date.new_utc() - timedelta(days = days)
+		date = Date.new_utc() - timedelta(days = days)
-		params = {"limit": limit.timestamp()}
 
 		with self._db.session(True) as conn:
-			with conn.execute("DELETE FROM cache WHERE updated < :limit", params):
+			with conn.execute("DELETE FROM cache WHERE updated < :limit", {"limit": date}):
 				pass
 
 

relay/http_client.py

@@ -134,9 +134,6 @@ class HttpClient:
 			data = await resp.text()
 
 		if resp.status not in (200, 202):
-			logging.verbose('Received error when requesting %s: %i', url, resp.status)
-			logging.debug(data)
-
 			try:
 				error = json.loads(data)["error"]
 
@@ -223,16 +220,12 @@ class HttpClient:
 		logging.verbose('Sending "%s" to %s', mtype, url)
 
 		async with self._session.post(url, headers = headers, data = body) as resp:
-			# Not expecting a response, so just return
+			if resp.status not in (200, 202):
-			if resp.status in {200, 202}:
+				raise HttpError(
-				logging.verbose('Successfully sent "%s" to %s', mtype, url)
+					resp.status,
-				return
+					await resp.text(),
-
+					headers = {k: v for k, v in resp.headers.items()}
-			logging.error('Received error when pushing to %s: %i', url, resp.status)
+				)
-			logging.debug(await resp.read())
-			logging.debug("message: %s", body.decode("utf-8"))
-			logging.debug("headers: %s", json.dumps(headers, indent = 4))
-			return
 
 
 	async def fetch_nodeinfo(self, domain: str, force: bool = False) -> Nodeinfo:

relay/workers.py

@@ -5,6 +5,7 @@ import traceback
 
 from aiohttp.client_exceptions import ClientConnectionError, ClientSSLError
 from asyncio.exceptions import TimeoutError as AsyncTimeoutError
+from blib import HttpError
 from dataclasses import dataclass
 from multiprocessing import Event, Process, Queue, Value
 from multiprocessing.queues import Queue as QueueType
@@ -94,6 +95,9 @@ class PushWorker(Process):
 		try:
 			await self.client.post(item.inbox, item.message, item.instance)
 
+		except HttpError as e:
+			logging.error('HTTP Error when pushing to %s: %i %s', item.inbox, e.status, e.message)
+
 		except AsyncTimeoutError:
 			logging.error('Timeout when pushing to %s', item.domain)