nifangxu 1 mesiac pred
rodič
commit
27f713e5be

+ 1 - 0
core/alarm_plan_dispatcher.py

@@ -58,4 +58,5 @@ def init_alarm_plan_disp():
 
 def start_alarm_plan_dispatcher():
     g_las.g_alarm_plan_disp.start()
+    LOGINFO(f"start g_alarm_plan_disp succeed")
 

+ 2 - 1
core/alarm_plan_manager.py

@@ -307,7 +307,7 @@ class AlarmPlanManager:
                     self.push(plan_uuid, alarm_plan)
                 else:
                     self.push_cron(plan_uuid, alarm_plan)
-                LOGINFO(f"create new alarm_plan: {plan_uuid}, {plan_name}")
+                LOGINFO(f"update alarm_plan: {plan_uuid}, {plan_name}")
 
         except json.JSONDecodeError as e:
             tb_info = traceback.extract_tb(e.__traceback__)
@@ -327,6 +327,7 @@ def init_alarm_plan_mgr():
 
 def start_alarm_plan_mgr():
     g_las.g_alarm_plan_mgr.start_scheduler(interval=1)
+    LOGINFO(f"start g_alarm_plan_mgr succeed")
 
 
 # --------------------------------------

+ 2 - 1
mqtt/mqtt_recv.py

@@ -292,7 +292,8 @@ def process_message(client:mqtt.Client, userdata, msg:mqtt.MQTTMessage):
     elif (check_topic(topic,Topic_Pattern.opc_all)):     # 运维客户端
         return
         deal_opc_msg(client, userdata, msg)
-    elif (check_topic(topic,Topic_Pattern.das_all)):     # 设备接入
+    elif (check_topic(topic,Topic_Pattern.das_all)):     # 设备代理
+        return
         deal_das_msg(client, userdata, msg)
     elif (check_topic(topic,Topic_Pattern.las_all)):     # 只接受告警配置相关
         deal_las_msg(client, userdata, msg)