From 2bf7cdc2df8482b775c05e783e49f3bb7ec58da5 Mon Sep 17 00:00:00 2001
From: ljm <1271952916@qq.com>
Date: Thu, 20 Oct 2022 16:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90zlm=E5=BF=83=E8=B7=B3hook=E3=80=91?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=9F=A5=E8=AF=A2redis=E4=BA=86=20=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=B9=9F=E4=B8=8D=E9=9C=80=E8=A6=81=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E8=AF=9D=E5=BA=94=E8=AF=A5=E6=81=A2=E5=A4=8Dzlm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/service/impl/MediaServerServiceImpl.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 7c5b1499..cdaa7e6d 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -644,19 +644,13 @@ public class MediaServerServiceImpl implements IMediaServerService {
         MediaServerItem mediaServerItem = getOne(mediaServerId);
         if (mediaServerItem == null) {
             // 缓存不存在，从数据库查询，如果数据库不存在则是错误的
-            MediaServerItem mediaServerItemFromDatabase = getOneFromDatabase(mediaServerId);
-            if (mediaServerItemFromDatabase == null) {
-                return;
-            }
-            // zlm连接重试
-            logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息,尝试重连zlm");
-//            reloadZlm();
-            mediaServerItem = getOne(mediaServerId);
+            mediaServerItem = getOneFromDatabase(mediaServerId);
             if (mediaServerItem == null) {
-                // zlm连接重试
                 logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息");
                 return;
             }
+            // zlm连接重试
+            logger.warn("[更新ZLM 保活信息]尝试链接默认zml");
         }
         final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
         dynamicTask.stop(zlmKeepaliveKey);