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

Cleanup: use max of last update and start time to determine expiry time

Browse Source
This commit is contained in:
Thomas Oettli
2026-02-01 04:57:22 +01:00
parent cd5979556c
commit 5d2b9c3ffb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ddns_service/cleanup.py
View File

@@ -8,12 +8,13 @@ from .models import Hostname, User
from datetime import timedelta from datetime import timedelta
def cleanup_expired(app): def cleanup_expired(app, start_time=None):
""" """
Clean up expired hostnames and return count of cleaned entries. Clean up expired hostnames and return count of cleaned entries.
Args: Args:
app: Application instance with dns_service and email_service. app: Application instance with dns_service and email_service.
start_time: Timezone aware datetime object containg the start time of the cleanup thread.
Returns: Returns:
Number of expired hostnames processed. Number of expired hostnames processed.
@@ -30,12 +31,14 @@ def cleanup_expired(app):
ipv6_expired = False ipv6_expired = False
if hostname.last_ipv4: if hostname.last_ipv4:
expiry_time = hostname.last_ipv4_update + timedelta(seconds=hostname.expiry_ttl) last_update = max(hostname.last_ipv4_update, start_time)
expiry_time = last_update + timedelta(seconds=hostname.expiry_ttl)
if now > expiry_time: if now > expiry_time:
ipv4_expired = True ipv4_expired = True
if hostname.last_ipv6: if hostname.last_ipv6:
expiry_time = hostname.last_ipv6_update + timedelta(seconds=hostname.expiry_ttl) last_update = max(hostname.last_ipv6_update, start_time)
expiry_time = last_update + timedelta(seconds=hostname.expiry_ttl)
if now > expiry_time: if now > expiry_time:
ipv6_expired = True ipv6_expired = True
@@ -117,10 +120,11 @@ class ExpiredRecordsCleanupThread(threading.Thread):
def run(self): def run(self):
"""Run the cleanup loop.""" """Run the cleanup loop."""
logging.info(f"Expired records cleanup thread started: interval={self.interval}s") logging.info(f"Expired records cleanup thread started: interval={self.interval}s")
start_time = now_utc()
while not self.stop_event.wait(self.interval): while not self.stop_event.wait(self.interval):
try: try:
count = cleanup_expired(self.app) count = cleanup_expired(self.app, start_time)
if count > 0: if count > 0:
logging.info(f"Expired records cleanup completed: count={count}") logging.info(f"Expired records cleanup completed: count={count}")
except Exception as e: except Exception as e: