spacefreak/ddns-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error handling during cleanup

Browse Source
This commit is contained in:
Thomas Oettli
2026-01-23 19:40:01 +01:00
parent ff48f7b016
commit 6c4b876191
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ddns_service/cleanup.py
View File

@@ -42,20 +42,37 @@ def cleanup_expired(app):
if not ipv4_expired and not ipv6_expired:
continue
ipv4_deleted = False
ipv6_deleted = False
if app.dns_service:
if ipv4_expired:
logging.info(
f"Host expired: hostname={hostname.hostname} zone={hostname.zone} "
f"ip={hostname.last_ipv4}"
)
try:
app.dns_service.delete_record(hostname.hostname, hostname.zone, "A")
ipv4_deleted = True
except Exception as e:
logging.error(
f"DNS delete failed: hostname={hostname.hostname} "
f"zone={hostname.zone} type=A error={e}"
)
if ipv6_expired:
logging.info(
f"Host expired: hostname={hostname.hostname} zone={hostname.zone} "
f"ip={hostname.last_ipv6}"
)
try:
app.dns_service.delete_record(hostname.hostname, hostname.zone, "AAAA")
ipv6_deleted = True
except Exception as e:
logging.error(
f"DNS delete failed: hostname={hostname.hostname} "
f"zone={hostname.zone} type=AAAA error={e}"
)
if app.email_service:
app.email_service.send_expiry_notification(
@@ -65,15 +82,14 @@ def cleanup_expired(app):
ipv6_expired
)
# Clear IP addresses
if ipv4_expired:
# Clear IP addresses only if DNS delete succeeded
if ipv4_deleted:
hostname.last_ipv4 = None
if ipv6_expired:
if ipv6_deleted:
hostname.last_ipv6 = None
if ipv4_expired or ipv6_expired:
if ipv4_deleted or ipv6_deleted:
hostname.save()
expired_count += 1
return expired_count