]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
unbound-dhcp-leases-bridge: Remove fixed leases cache
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 May 2024 16:40:27 +0000 (17:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 May 2024 16:40:27 +0000 (17:40 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/unbound/unbound-dhcp-leases-bridge

index 7f3f6dd794622f58cb8e369369047c1c016cca64..5cc6e3d55a3e21fbbb54da706635d4567a8c1868 100644 (file)
@@ -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