增加mqtt客户端重连机制
This commit is contained in:
+6
-16
@@ -1,11 +1,8 @@
|
||||
import logging
|
||||
import json
|
||||
import threading
|
||||
from typing import Dict, Any, Optional
|
||||
|
||||
import base64
|
||||
|
||||
from config import ConfigManager
|
||||
from mqtt_client import MqttClient
|
||||
from file_handler import FileHandler
|
||||
from compute_service import ComputeService
|
||||
@@ -21,9 +18,6 @@ class CpyServer:
|
||||
|
||||
# 服务器状态
|
||||
self.running = False
|
||||
self.host = config_manager.get('http.host', '0.0.0.0')
|
||||
self.port = config_manager.get('http.port', 5000)
|
||||
self.server_thread = None
|
||||
|
||||
# 初始化各个模块
|
||||
self._init_modules()
|
||||
@@ -45,7 +39,7 @@ class CpyServer:
|
||||
# 初始化计算服务
|
||||
self.compute_services = {}
|
||||
|
||||
for dev_id in config_manager.get('udp.udp_map', {}).keys():
|
||||
for dev_id in config_manager.get('udp_map', {}).keys():
|
||||
try:
|
||||
compute_service = ComputeService(dev_id)
|
||||
logger.info(f"ComputeService initialized for dev_id: {dev_id}, udp port {compute_service.udp_handler.port}")
|
||||
@@ -228,29 +222,27 @@ class CpyServer:
|
||||
return json.dumps({'error': str(e)})
|
||||
|
||||
def start(self):
|
||||
"""启动HTTP服务器"""
|
||||
"""启动服务"""
|
||||
if self.running:
|
||||
logger.warning("Server is already running")
|
||||
return
|
||||
|
||||
self.running = True
|
||||
logger.info(f"Starting HTTP server on {self.host}:{self.port}")
|
||||
|
||||
# 启动MQTT客户端
|
||||
if self.mqtt_client:
|
||||
self.mqtt_client.connect()
|
||||
|
||||
|
||||
logger.info("HTTP server started")
|
||||
logger.info("Server started")
|
||||
|
||||
def stop(self):
|
||||
"""停止HTTP服务器"""
|
||||
"""停止服务"""
|
||||
if not self.running:
|
||||
logger.warning("Server is not running")
|
||||
return
|
||||
|
||||
self.running = False
|
||||
logger.info("Stopping HTTP server")
|
||||
logger.info("Stopping server")
|
||||
|
||||
# 断开MQTT连接
|
||||
if self.mqtt_client:
|
||||
@@ -268,9 +260,7 @@ class CpyServer:
|
||||
except:
|
||||
pass
|
||||
|
||||
# Flask会在新线程中运行,需要特殊处理
|
||||
# 这里只是标记状态,实际停止需要更复杂的处理
|
||||
logger.info("HTTP server stopped")
|
||||
logger.info("Server stopped")
|
||||
|
||||
def is_running(self) -> bool:
|
||||
"""检查服务器是否在运行"""
|
||||
|
||||
Reference in New Issue
Block a user