From 9b01f9a35ded7792309eb16b496cfde25bb23632 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Sun, 31 Jul 2022 23:31:22 +0200 Subject: [PATCH 1/5] deleta refrest actor data task --- api/config/settings/common.py | 5 ----- api/funkwhale_api/federation/tasks.py | 30 --------------------------- 2 files changed, 35 deletions(-) diff --git a/api/config/settings/common.py b/api/config/settings/common.py index a125cd540..81fb10996 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -862,11 +862,6 @@ CELERY_BEAT_SCHEDULE = { "schedule": crontab(day_of_week="1", minute="0", hour="2"), "options": {"expires": 60 * 60 * 24}, }, - "federation.refresh_actor_data": { - "task": "federation.refresh_actor_data", - "schedule": crontab(minute="0", hour="*/5"), - "options": {"expires": 60 * 60}, - }, } if env.bool("ADD_ALBUM_TAGS_FROM_TRACKS", default=True): diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py index aac52ce9c..f633a687c 100644 --- a/api/funkwhale_api/federation/tasks.py +++ b/api/funkwhale_api/federation/tasks.py @@ -627,33 +627,3 @@ def fetch_collection(url, max_pages, channel, is_page=False): results["errored"], ) return results - - -@celery.app.task(name="federation.refresh_actor_data") -def refresh_actor_data(): - actors = models.Actor.objects.all().prefetch_related() - for actor in actors: - if actor.is_local: - # skip refreshing local actors - continue - - try: - data = actors_utils.get_actor_data(actor.fid) - except HTTPError as e: - logger.info( - f"Actor couldn't be fetch because of the following exeption : {e!r}" - ) - if e.response.status_code == 410: - logger.info("Purging actor : {actor.fid!r}") - purge_actors([actor.id], [actor.domain]) - continue - continue - except Exception as e: - logger.info( - f"Actor couldn't be fetch because of the following exeption : {e!r}" - ) - continue - serializer = serializers.ActorSerializer(data=data) - serializer.is_valid(raise_exception=True) - serializer.save(last_fetch_date=timezone.now()) - return -- GitLab From ce64fdc3165ef4dea9ed54f3fbca5a75d2caf647 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Mon, 5 Sep 2022 13:56:37 +0200 Subject: [PATCH 2/5] changelog --- changes/changelog.d/1798.enhancement | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/changelog.d/1798.enhancement diff --git a/changes/changelog.d/1798.enhancement b/changes/changelog.d/1798.enhancement new file mode 100644 index 000000000..908c381cf --- /dev/null +++ b/changes/changelog.d/1798.enhancement @@ -0,0 +1 @@ + Delete refresh actor data task \ No newline at end of file -- GitLab From 3c20509ced1a4c4b9f0e9c66b527563bc6b356b5 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Fri, 16 Sep 2022 18:46:39 +0200 Subject: [PATCH 3/5] del changelog --- changes/changelog.d/1798.enhancement | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changes/changelog.d/1798.enhancement diff --git a/changes/changelog.d/1798.enhancement b/changes/changelog.d/1798.enhancement deleted file mode 100644 index 908c381cf..000000000 --- a/changes/changelog.d/1798.enhancement +++ /dev/null @@ -1 +0,0 @@ - Delete refresh actor data task \ No newline at end of file -- GitLab From 9a5911ecf2395e7952584db15d4bc48d8457bcf0 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Wed, 12 Oct 2022 15:05:48 +0200 Subject: [PATCH 4/5] del old changelog --- changes/changelog.d/1392.enhancement | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changes/changelog.d/1392.enhancement diff --git a/changes/changelog.d/1392.enhancement b/changes/changelog.d/1392.enhancement deleted file mode 100644 index 4b7d9be44..000000000 --- a/changes/changelog.d/1392.enhancement +++ /dev/null @@ -1 +0,0 @@ -Add task to refresh actor data in the cache (#1392) -- GitLab From 315d719f1b21d6e314bfa38af8e87c5b586045f1 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Sun, 16 Oct 2022 12:29:10 +0200 Subject: [PATCH 5/5] lint --- api/funkwhale_api/federation/tasks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py index f633a687c..bf3440524 100644 --- a/api/funkwhale_api/federation/tasks.py +++ b/api/funkwhale_api/federation/tasks.py @@ -3,7 +3,6 @@ import json import logging import os import requests -from requests import HTTPError from django.conf import settings from django.db import transaction @@ -18,7 +17,6 @@ from funkwhale_api.common import preferences from funkwhale_api.common import models as common_models from funkwhale_api.common import session from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import actors as actors_utils from funkwhale_api.moderation import mrf from funkwhale_api.music import models as music_models from funkwhale_api.taskapp import celery -- GitLab