From 78c3764cc61cc0519a0af860e2ad4eaf4aa8cb9e Mon Sep 17 00:00:00 2001 From: petitminion Date: Thu, 27 Oct 2022 15:46:01 +0000 Subject: [PATCH] Fix remote instance ping --- api/config/settings/common.py | 4 ++-- api/funkwhale_api/federation/tasks.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/config/settings/common.py b/api/config/settings/common.py index b24cad2c0..1d5789e8d 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -862,8 +862,8 @@ CELERY_BEAT_SCHEDULE = { "schedule": crontab(day_of_week="1", minute="0", hour="2"), "options": {"expires": 60 * 60 * 24}, }, - "federation.check_remote_instance_availability": { - "task": "federation.check_remote_instance_availability", + "federation.check_all_remote_instance_availability": { + "task": "federation.check_all_remote_instance_availability", "schedule": crontab( **env.dict( "SCHEDULE_FEDERATION_CHECK_INTANCES_AVAILABILITY", diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py index 8c94ead41..a24384ceb 100644 --- a/api/funkwhale_api/federation/tasks.py +++ b/api/funkwhale_api/federation/tasks.py @@ -646,14 +646,17 @@ def check_single_remote_instance_availability(domain): ) domain.reachable = False domain.save() + return domain.reachable if "version" in nodeinfo.keys(): domain.reachable = True domain.last_successful_contact = datetime.datetime.now() domain.save() + return domain.reachable else: logger.info( f"Domain {domain.name} is not reacheable at the moment. Setting domain as unreacheable." ) domain.reachable = False domain.save() + return domain.reachable