From 09b91712f7036d607f65ff1f609ff9db5f4fcc87 Mon Sep 17 00:00:00 2001 From: Her Email Date: Tue, 5 Dec 2023 21:57:00 -0500 Subject: [PATCH] identity_fetched: fix potential race condition --- takahe/ap_handlers.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/takahe/ap_handlers.py b/takahe/ap_handlers.py index a7cb5c07..91aa8684 100644 --- a/takahe/ap_handlers.py +++ b/takahe/ap_handlers.py @@ -1,4 +1,5 @@ from datetime import datetime +from time import sleep from loguru import logger @@ -123,7 +124,15 @@ def post_deleted(pk, obj): def identity_fetched(pk): - identity = Takahe.get_identity(pk) + try: + identity = Identity.objects.get(pk=pk) + except Identity.DoesNotExist: + sleep(2) + try: + identity = Identity.objects.get(pk=pk) + except Identity.DoesNotExist: + logger.warning(f"Fetched identity {pk} not found") + return if identity.username and identity.domain: apid = Takahe.get_or_create_remote_apidentity(identity) if apid: