PyPI - assemblyline-core - Versions diffs - 4.7.5.dev94__tar.gz → 4.7.5.dev97__tar.gz - Mend

@@ -427,35 +427,38 @@ class ExpiryManager(ServerBase):
         Perodically a workers will terminate and this calculation will be redone.
         """
         while self.running:
-            # Calculate how many queries we want to run
-            queries = self.day_chunks(collection)
+            self.run_collection_once(collection)
-            # prepare a thread pool suitable for that operation
-            with ThreadPoolExecutor(len(queries)) as pool:
-                # Prepare a signal so we can stop all the workers as desired
-                stop = threading.Event()
+    def run_collection_once(self, collection):
+        # Calculate how many queries we want to run
+        queries = self.day_chunks(collection)
-                # dispatch each of these queries
-                futures = [pool.submit(self.run_collection_query, collection, stop, query) for query in queries]
+        # prepare a thread pool suitable for that operation
+        with ThreadPoolExecutor(len(queries)) as pool:
+            # Prepare a signal so we can stop all the workers as desired
+            stop = threading.Event()
-                # wait for one of them to finish
-                for future in as_completed(futures):
-                    stop.set()
-                    future.result()
+            # dispatch each of these queries
+            futures = [pool.submit(self.run_collection_query, collection, stop, query) for query in queries]
-    def day_chunks(self, collection):
-        # Figure out the range of time we want to build queries for
-        earliest = self.get_earliest_expiring(collection)
-        if not earliest:
-            return []
-        days = int((now() - earliest)/(60 * 60 * 24)) + 1
+            # wait for one of them to finish
+            for future in as_completed(futures):
+                stop.set()
+                future.result()
+    def day_chunks(self, collection):
         # Base no settings we will truncade expiry ranges by the day
         if self.config.core.expiry.batch_delete:
             suffix = f"-{self.config.core.expiry.delay}h/d"
         else:
             suffix = f"-{self.config.core.expiry.delay}h"
+        # Figure out the range of time we want to build queries for
+        earliest = self.get_earliest_expiring(collection)
+        if not earliest:
+            return [f"expiry_ts: [* TO now{suffix}}}"]
+        days = int((now() - earliest)/(60 * 60 * 24)) + 1
         # construct the ranges that build queries covering all of those days, bounded by
         # the appropirately modifide NOW on the high end, and modfied to be open on the low end
         ranges = [(f"now-1d{suffix}", f"now{suffix}")]

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev94
+Version: 4.7.5.dev97
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev94
+Version: 4.7.5.dev97
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

@@ -70,7 +70,7 @@ def test_expire_all(config, ds_expiry, filestore):
             if collection.name in expiry.fs_hashmap:
                 expiry.feed_expiry_jobs(collection=collection, pool=pool, start='*', jobs=[])
             else:
-                pool.submit(expiry.run_collection, collection)
+                pool.submit(expiry.run_collection_once, collection)
     for k, v in expiry_collections_len.items():
         assert v == expiry.counter.get(k)

	@@ -0,0 +1 @@
1	+ 4.7.5.dev97

	@@ -1 +0,0 @@
1	- 4.7.5.dev94

assemblyline-core 4.7.5.dev94__tar.gz → 4.7.5.dev97__tar.gz

assemblyline-core 4.7.5.dev94tar.gz → 4.7.5.dev97tar.gz