From 3905f84ec822a0719f31ac1de1126c1eb29dc691 Mon Sep 17 00:00:00 2001
From: Doug Hoyte <doug@hcsw.org>
Date: Wed, 4 Sep 2024 23:08:50 -0400
Subject: [PATCH] clean-up expiration logic a bit

---
 src/apps/relay/RelayCron.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/relay/RelayCron.cpp b/src/apps/relay/RelayCron.cpp
index 9de90a2..ca776f4 100644
--- a/src/apps/relay/RelayCron.cpp
+++ b/src/apps/relay/RelayCron.cpp
@@ -85,7 +85,8 @@ void RelayServer::runCron() {
                 auto expiration = lmdb::from_sv<uint64_t>(k);
                 auto levId =  lmdb::from_sv<uint64_t>(v);
 
-                if (levId == mostRecent) return true;
+                if (expiration > now) return false;
+                if (levId == mostRecent) return true; // don't delete because it could cause levId re-use
 
                 if (expiration == 1) { // Ephemeral event
                     auto view = env.lookup_Event(txn, levId);
@@ -96,12 +97,12 @@ void RelayServer::runCron() {
                         numEphemeral++;
                         expiredLevIds.emplace_back(levId);
                     }
-                } else if (expiration <= now) {
+                } else {
                     numExpired++;
                     expiredLevIds.emplace_back(levId);
                 }
 
-                return expiration <= now;
+                return true;
             });
         }