aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'webmentions_ssg/tasks')
-rw-r--r--webmentions_ssg/tasks/retention.py7
-rw-r--r--webmentions_ssg/tasks/verification.py59
2 files changed, 62 insertions, 4 deletions
diff --git a/webmentions_ssg/tasks/retention.py b/webmentions_ssg/tasks/retention.py
index b4b6a83..09e4cfd 100644
--- a/webmentions_ssg/tasks/retention.py
+++ b/webmentions_ssg/tasks/retention.py
@@ -11,7 +11,11 @@ from flask import current_app
from ..db_helpers import rows_affected
from ..extensions import db
-from ..models.received import ReceivedWebmention, ReceivedWebmentionStatus
+from ..models.received import (
+ ReceivedWebmention,
+ ReceivedWebmentionStatus,
+ purge_orphaned_received_events,
+)
def purge_old_received_webmentions() -> int:
@@ -41,6 +45,7 @@ def purge_old_received_webmentions() -> int:
ReceivedWebmention.updated_at < cutoff,
)
)
+ purge_orphaned_received_events()
db.session.commit()
count = rows_affected(result)
diff --git a/webmentions_ssg/tasks/verification.py b/webmentions_ssg/tasks/verification.py
index ca45777..87e64de 100644
--- a/webmentions_ssg/tasks/verification.py
+++ b/webmentions_ssg/tasks/verification.py
@@ -15,7 +15,11 @@ from flask import current_app
from ..db_helpers import rows_affected
from ..extensions import db, huey
-from ..models.received import ReceivedWebmention, ReceivedWebmentionStatus
+from ..models.received import (
+ ReceivedWebmention,
+ ReceivedWebmentionStatus,
+ ReceivedWebmentionStatusEvent,
+)
from ..moderation_policy import rejection_reason
from ..net import (
AddressResolutionError,
@@ -185,6 +189,15 @@ def claim_for_verification(webmention_uuid: uuid.UUID) -> VerificationClaim | No
db.session.rollback()
return None
+ db.session.add(
+ ReceivedWebmentionStatusEvent(
+ webmention_uuid=webmention_uuid,
+ status=ReceivedWebmentionStatus.VERIFYING,
+ action="Verification started",
+ occurred_at=claim.lease_started_at,
+ recovery_attempts=webmention.recovery_attempts,
+ )
+ )
db.session.commit()
return claim
@@ -234,6 +247,7 @@ def store_verification_outcome(
:param reason: Optional explanation for a failed or source-removed Webmention.
:returns: ``True`` if the worker still owned the lease and persisted the outcome.
"""
+ at = datetime.now(UTC)
changed = db.session.execute(
sa.update(ReceivedWebmention)
.where(
@@ -241,10 +255,29 @@ def store_verification_outcome(
ReceivedWebmention.status == ReceivedWebmentionStatus.VERIFYING,
ReceivedWebmention.updated_at == claim.lease_started_at,
)
- .values(status=status, failure_reason=reason, updated_at=datetime.now(UTC))
+ .values(status=status, failure_reason=reason, updated_at=at)
+ )
+ if rows_affected(changed) != 1:
+ db.session.rollback()
+ return False
+
+ recovery_attempts = db.session.scalar(
+ sa.select(ReceivedWebmention.recovery_attempts).where(
+ ReceivedWebmention.uuid == claim.webmention_uuid
+ )
+ )
+ db.session.add(
+ ReceivedWebmentionStatusEvent(
+ webmention_uuid=claim.webmention_uuid,
+ status=status,
+ action="Verification completed",
+ occurred_at=at,
+ failure_reason=reason,
+ recovery_attempts=recovery_attempts or 0,
+ )
)
db.session.commit()
- return rows_affected(changed) == 1
+ return True
@huey.task(retries=2, retry_delay=50)
@@ -345,6 +378,26 @@ def recover_stale_verifications() -> int:
db.session.rollback()
continue
+ db.session.add(
+ ReceivedWebmentionStatusEvent(
+ webmention_uuid=identifier,
+ status=(
+ ReceivedWebmentionStatus.FAILED
+ if at_limit
+ else ReceivedWebmentionStatus.RECEIVED
+ ),
+ action=(
+ "Recovery limit exhausted"
+ if at_limit
+ else "Stale verification recovered"
+ ),
+ occurred_at=now,
+ failure_reason=RECOVERY_EXHAUSTED_REASON if at_limit else None,
+ recovery_attempts=(
+ recovery_attempts if at_limit else recovery_attempts + 1
+ ),
+ )
+ )
db.session.commit()
if at_limit: