From 60ebf4b387b82c950ff0d10d01edc05bc4f969a9 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Sun, 1 Feb 2026 01:36:52 +0100 Subject: [PATCH] Improve cleanup logic --- src/ddns_service/cleanup.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ddns_service/cleanup.py b/src/ddns_service/cleanup.py index 40c81c9..412bf52 100644 --- a/src/ddns_service/cleanup.py +++ b/src/ddns_service/cleanup.py @@ -74,12 +74,15 @@ def cleanup_expired(app): f"zone={hostname.zone} type=AAAA error={e}" ) + if not (ipv4_deleted or ipv6_deleted): + continue + if app.email_service: app.email_service.send_expiry_notification( hostname.user.email, hostname, - ipv4_expired, - ipv6_expired + ipv4_deleted, + ipv6_deleted ) # Clear IP addresses only if DNS delete succeeded @@ -88,9 +91,8 @@ def cleanup_expired(app): if ipv6_deleted: hostname.last_ipv6 = None - if ipv4_deleted or ipv6_deleted: - hostname.save() - expired_count += 1 + hostname.save() + expired_count += 1 return expired_count