From 8628d3e8d06ce2e4d1b8cc3aa0f3826108e555e7 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 May 2024 17:40:27 +0100 Subject: [PATCH] unbound-dhcp-leases-bridge: Remove fixed leases cache Signed-off-by: Michael Tremer --- config/unbound/unbound-dhcp-leases-bridge | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index 7f3f6dd79..5cc6e3d55 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -482,12 +482,10 @@ class DHCPLeases(object): class FixLeases(object): - cache = {} - def __init__(self, path): self.path = path - self._leases = self.cache[self.path] = self._parse() + self._leases = self._parse() def __iter__(self): return iter(self._leases) @@ -495,9 +493,10 @@ class FixLeases(object): def _parse(self): log.info("Reading fix leases from %s" % self.path) - leases = [] now = datetime.datetime.utcnow() + leases = [] + with open(self.path) as f: for line in f.readlines(): line = line.rstrip() @@ -521,15 +520,6 @@ class FixLeases(object): }) leases.append(l) - # Try finding any deleted leases - for lease in self.cache.get(self.path, []): - if lease in leases: - continue - - # Free the deleted lease - lease.free() - leases.append(lease) - return leases -- 2.39.5