Move interrupt_handler processing to tasks

Signed-off-by: cyc60 <avsysoev60@gmail.com>

Author: cyc60

src/commands/start.py

@@ -293,24 +293,23 @@ async def main() -> None:
 
     logger.info('Started operator service')
     with InterruptHandler() as interrupt_handler:
-        while not interrupt_handler.exit:
-            tasks = [
-                ValidatorsTask(
-                    keystores=keystores,
-                    remote_signer_config=remote_signer_config,
-                    deposit_data=deposit_data,
-                ).run(),
-                ExitSignatureTask(
-                    keystores=keystores,
-                    remote_signer_config=remote_signer_config,
-                ).run(),
-                MetricsTask().run(),
-                WalletTask().run(),
-            ]
-            if settings.harvest_vault:
-                tasks.append(HarvestTask().run())
+        tasks = [
+            ValidatorsTask(
+                keystores=keystores,
+                remote_signer_config=remote_signer_config,
+                deposit_data=deposit_data,
+            ).run(interrupt_handler),
+            ExitSignatureTask(
+                keystores=keystores,
+                remote_signer_config=remote_signer_config,
+            ).run(interrupt_handler),
+            MetricsTask().run(interrupt_handler),
+            WalletTask().run(interrupt_handler),
+        ]
+        if settings.harvest_vault:
+            tasks.append(HarvestTask().run(interrupt_handler))
 
-            await asyncio.gather(*tasks)
+        await asyncio.gather(*tasks)
 
 
 def log_start() -> None:

src/common/tasks.py

@@ -2,6 +2,8 @@
 import logging
 import time
 
+from sw_utils import InterruptHandler
+
 from src.common.utils import log_verbose
 from src.config.settings import settings
 
@@ -12,8 +14,8 @@ class BaseTask:
     async def process_block(self):
         raise NotImplementedError
 
-    async def run(self):
-        while True:
+    async def run(self, interrupt_handler: InterruptHandler) -> None:
+        while not interrupt_handler.exit:
             start_time = time.time()
             try:
                 await self.process_block()