Fix signal handling conflict in combined_main.py and add missing imports
Some checks failed
Integration Tests / test-service-integration (push) Has been cancelled
Python Tests / test-python (push) Has been cancelled
Security Scanning / security-scan (push) Has been cancelled

This commit is contained in:
aitbc
2026-04-13 20:09:43 +02:00
parent 4a7936d201
commit 830d8abf76
2 changed files with 31 additions and 54 deletions

View File

@@ -6,8 +6,6 @@ Runs both the main blockchain node and P2P placeholder service
import asyncio
import logging
import os
import signal
import sys
from pathlib import Path
@@ -22,18 +20,10 @@ logger = logging.getLogger(__name__)
class CombinedService:
def __init__(self):
self._stop_event = asyncio.Event()
self._tasks = []
self._loop = None
def set_stop_event(self):
"""Set the stop event to trigger shutdown"""
if self._stop_event and not self._stop_event.is_set():
self._stop_event.set()
async def start(self):
"""Start both blockchain node and P2P server"""
self._loop = asyncio.get_running_loop()
logger.info("Starting combined blockchain service")
# Start blockchain node in background
@@ -43,7 +33,8 @@ class CombinedService:
logger.info(f"Combined service started - Node on mainnet")
try:
await self._stop_event.wait()
# Wait for the node task to complete
await node_task
finally:
await self.stop()
@@ -53,7 +44,8 @@ class CombinedService:
# Cancel all tasks
for task in self._tasks:
task.cancel()
if not task.done():
task.cancel()
# Wait for tasks to complete
if self._tasks:
@@ -62,25 +54,9 @@ class CombinedService:
self._tasks.clear()
logger.info("Combined service stopped")
# Global service instance for signal handler
_service_instance = None
def signal_handler(signum, frame):
"""Handle shutdown signals"""
logger.info(f"Received signal {signum}, initiating shutdown")
global _service_instance
if _service_instance:
_service_instance.set_stop_event()
async def main():
"""Main entry point"""
global _service_instance
service = CombinedService()
_service_instance = service
# Set up signal handlers
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)
try:
await service.start()
@@ -88,7 +64,6 @@ async def main():
logger.info("Received keyboard interrupt")
finally:
await service.stop()
_service_instance = None
if __name__ == "__main__":
asyncio.run(main())