Refactor and further improve error handling / logging
This commit is contained in:
@@ -48,30 +48,32 @@ def cleanup_expired(app):
|
||||
if app.dns_service:
|
||||
if ipv4_expired:
|
||||
logging.info(
|
||||
f"Host expired: hostname={hostname.hostname} zone={hostname.zone} "
|
||||
f"ip={hostname.last_ipv4}"
|
||||
f"Cleanup: Host expired: hostname={hostname.hostname} zone={hostname.zone} "
|
||||
f"ipv4={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 error: {e}")
|
||||
logging.error(
|
||||
f"DNS delete failed: hostname={hostname.hostname} "
|
||||
f"zone={hostname.zone} type=A error={e}"
|
||||
f"Cleanup failed: hostname={hostname.hostname} "
|
||||
f"zone={hostname.zone} type=A"
|
||||
)
|
||||
|
||||
if ipv6_expired:
|
||||
logging.info(
|
||||
f"Host expired: hostname={hostname.hostname} zone={hostname.zone} "
|
||||
f"ip={hostname.last_ipv6}"
|
||||
f"Cleanup: Host expired: hostname={hostname.hostname} zone={hostname.zone} "
|
||||
f"ipv6={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 error: {e}")
|
||||
logging.error(
|
||||
f"DNS delete failed: hostname={hostname.hostname} "
|
||||
f"zone={hostname.zone} type=AAAA error={e}"
|
||||
f"Cleanup failed: hostname={hostname.hostname} "
|
||||
f"zone={hostname.zone} type=AAAA"
|
||||
)
|
||||
|
||||
if not (ipv4_deleted or ipv6_deleted):
|
||||
|
||||
Reference in New Issue
Block a user