Merge pull request #34 from busimus/master

Fix stored messages always getting deleted if config path has underscores
This commit is contained in:
markqvist 2025-11-02 11:33:00 +01:00 committed by GitHub
commit 557887d13f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1090,9 +1090,10 @@ class LXMRouter:
for transient_id in self.propagation_entries.copy():
entry = self.propagation_entries[transient_id]
filepath = entry[1]
components = filepath.split("_")
filename = os.path.split(filepath)[-1]
components = filename.split("_")
if len(components) == 2 and float(components[1]) > 0 and len(os.path.split(components[0])[1]) == (RNS.Identity.HASHLENGTH//8)*2:
if len(components) == 2 and float(components[1]) > 0 and len(components[0]) == (RNS.Identity.HASHLENGTH//8)*2:
timestamp = float(components[1])
if now > timestamp+LXMRouter.MESSAGE_EXPIRY:
RNS.log("Purging message "+RNS.prettyhexrep(transient_id)+" due to expiry", RNS.LOG_EXTREME)