Merge remote-tracking branch 'origin/release/2.8' into develop

superdesk · Jan 16, 2025 · 5697b53 · 5697b53
2 parents e1ee313 + fa5da65
commit 5697b53
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/planning/events/events.py b/server/planning/events/events.py
@@ -817,7 +817,7 @@ def get_expired_items(self, expiry_datetime, spiked_events_only=False):
         total_received = 0
         total_events = -1
 
-        while True:
+        while total_received + get_max_recurrent_events() < 10000:  # 10k is max elastic limit
             query["from"] = total_received
 
             results = self.search(query)