move queue process out of process_current_blocks (#922)

* move queue process out of process_current_blocks
* Bump version: 4.5.4 → 4.5.5

Author: alexcos20

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.5.4
+current_version = 4.5.5
 commit = True
 tag = True
 

aquarius/__init__.py

@@ -9,5 +9,5 @@
 __author__ = """OceanProtocol"""
 # fmt: off
 # bumpversion needs single quotes
-__version__ = '4.5.4'
+__version__ = '4.5.5'
 # fmt: on

aquarius/events/events_monitor.py

@@ -145,6 +145,13 @@ def do_run_monitor(self):
         if not self._monitor_is_on:
             return
 
+        if strtobool(os.getenv("PROCESS_RETRY_QUEUE", "0")):
+            logger.info("Starting process_queue ....")
+            try:
+                self.retry_mechanism.process_queue()
+            except (KeyError, Exception) as e:
+                logger.error(f"Error processing queue: {str(e)}.")
+
         try:
             logger.info("Starting process_current_blocks ....")
             self.process_current_blocks()
@@ -168,10 +175,6 @@ def do_run_monitor(self):
 
     def process_current_blocks(self):
         """Process all blocks from the last processed block to the current block."""
-        process_queue = strtobool(os.getenv("PROCESS_RETRY_QUEUE", "0"))
-
-        if process_queue:
-            self.retry_mechanism.process_queue()
 
         last_block = self.get_last_processed_block()
         current_block = None

setup.py

@@ -95,7 +95,7 @@
     url="https://github.com/oceanprotocol/aquarius",
     # fmt: off
     # bumpversion needs single quotes
-    version='4.5.4',
+    version='4.5.5',
     # fmt: on
     zip_safe=False,
 )