michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop instances from being flagged as 'gone forever' if they're still sending activities

Browse source
This commit is contained in:
rimu 2024-05-12 16:08:20 +12:00
parent 92de06a9be
commit ade07d2658
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/activitypub/routes.py
View file

@ -1080,6 +1080,8 @@ def process_inbox_request(request_json, activitypublog_id, ip_address):
user.instance.last_seen = utcnow() user.instance.last_seen = utcnow()
# user.instance.ip_address = ip_address # user.instance.ip_address = ip_address
user.instance.dormant = False user.instance.dormant = False
user.instance.gone_forever = False
user.instance.failures = 0
else: else:
activity_log.exception_message = 'Instance blocked' activity_log.exception_message = 'Instance blocked'

2
app/community/util.py
View file

@ -656,7 +656,7 @@ def send_to_remote_instance_task(instance_id: int, community_id: int, payload):
instance.failures += 1 instance.failures += 1
instance.most_recent_attempt = utcnow() instance.most_recent_attempt = utcnow()
instance.start_trying_again = utcnow() + timedelta(seconds=instance.failures ** 4) instance.start_trying_again = utcnow() + timedelta(seconds=instance.failures ** 4)
if instance.failures > 2: if instance.failures > 10:
instance.dormant = True instance.dormant = True
db.session.commit() db.session.commit()