From 6ce6ac30cc8778448ef0f31f2f4ca48591c6ca6e Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sat, 26 Nov 2022 12:06:20 +0100
Subject: [PATCH] fix: Remove outdated code
---
funkwhale_network/routes.py | 1 -
funkwhale_network/server.py | 1 -
funkwhale_network/worker.py | 24 ------------------------
3 files changed, 26 deletions(-)
diff --git a/funkwhale_network/routes.py b/funkwhale_network/routes.py
index a29e916..deea972 100644
--- a/funkwhale_network/routes.py
+++ b/funkwhale_network/routes.py
@@ -94,7 +94,6 @@ async def domains(request):
)
domain = await serializers.create_domain(request["conn"], payload)
- await request.app["crawler"].poll(payload["name"])
if domain:
payload = serializers.serialize_domain(domain)
return web.json_response(payload, status=201)
diff --git a/funkwhale_network/server.py b/funkwhale_network/server.py
index 289200b..07a554a 100644
--- a/funkwhale_network/server.py
+++ b/funkwhale_network/server.py
@@ -11,7 +11,6 @@ def prepare_app(app, pool):
app.router.add_get("/api/domains/stats", routes.stats)
app.add_routes([web.static("/static", routes.STATIC_DIR)])
app["pool"] = pool
- app["crawler"] = worker.Crawler()
async def on_shutdown(app):
diff --git a/funkwhale_network/worker.py b/funkwhale_network/worker.py
index 9d3575d..bc3a5e0 100644
--- a/funkwhale_network/worker.py
+++ b/funkwhale_network/worker.py
@@ -8,30 +8,6 @@ from aiohttp import ClientSession
from arq import cron
-#class Crawler(arq.Actor):
-class Crawler():
- async def startup(self):
- kwargs = crawler.get_session_kwargs()
- self.session = aiohttp.ClientSession()#loop=self.loop, **kwargs)
- self.pool = await db.get_pool(settings.DB_DSN)
-
- #@arq.concurrent
- async def poll(self, domain):
- async with self.pool.acquire() as conn:
- return await crawler.check(conn=conn, session=self.session, domain=domain)
-
- #@arq.cron(minute=0, hour={0, 6, 12, 18})
- async def poll_all(self):
- async with self.pool.acquire() as conn:
- for check in await db.get_latest_check_by_domain(conn):
- await self.poll(check["domain"])
-
- async def shutdown(self):
- await self.session.close()
- self.pool.close()
-
- await self.pool.wait_closed()
-
async def poll(ctx, domain):
session: ClientSession = ctx['session']
pool = await db.get_pool(settings.DB_DSN)
--
GitLab