refactor TelegramClient: remove signal handling and restart logic, replace app restart with process exit on disconnect limit

This commit is contained in:
vvzvlad
2025-04-29 15:10:13 +04:00
parent 5ac093c0bc
commit 7e6aa1f7ba
+1 -39
View File
@@ -35,7 +35,6 @@ class TelegramClient:
self.disconnect_count = 0
self.max_disconnects = 3
self._setup_connection_handlers()
self._setup_signal_handlers()
def _ensure_session_directory(self):
try:
@@ -50,11 +49,6 @@ class TelegramClient:
self.client.add_handler(DisconnectHandler(self._on_disconnect))
logger.info("connection_handlers: connection handlers set up")
def _setup_signal_handlers(self):
"""Sets up signal handlers for graceful shutdown"""
loop = asyncio.get_event_loop()
for sig in (signal.SIGTERM, signal.SIGINT):
loop.add_signal_handler(sig, lambda s=sig: asyncio.create_task(self._handle_shutdown(s)))
async def _on_disconnect(self, _client):
"""Handles disconnection from Telegram servers"""
@@ -63,7 +57,7 @@ class TelegramClient:
if self.disconnect_count >= self.max_disconnects:
logger.critical(f"connection_handler: reached disconnect limit ({self.max_disconnects})")
await self._restart_app()
sys.exit(1)
async def start(self):
try:
@@ -76,35 +70,3 @@ class TelegramClient:
except Exception as e:
logger.error(f"Failed to start Telegram client: {str(e)}")
raise
async def _restart_app(self):
"""Restarts the application"""
logger.warning("connection_handler: restarting application")
try:
# Properly shutdown client before restart
if self.client.is_connected:
await self.stop()
# First terminate current process
logger.info("connection_handler: terminating current process")
os.kill(os.getpid(), signal.SIGTERM)
# If process is still alive after 5 seconds, force kill it
await asyncio.sleep(5)
os.kill(os.getpid(), signal.SIGKILL)
except Exception as e:
logger.error(f"connection_handler: error during restart: {str(e)}")
# Emergency termination in case of restart failure
os.kill(os.getpid(), signal.SIGKILL)
async def stop(self):
if self.client.is_connected:
await self.client.stop()
logger.info("Telegram client disconnected")
async def _handle_shutdown(self, sig):
"""Handles graceful shutdown on receiving termination signal"""
logger.info(f"Received signal {sig.name}, shutting down gracefully")
await self.stop()
loop = asyncio.get_event_loop()
loop.stop()