From 9b1af8ef1396de45884fe86c56844714045b82ec Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 21:13:55 +0800
Subject: [PATCH] 适配zlm的hook保活
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index b0960df..5555617 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -3,17 +3,19 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -39,12 +41,25 @@
private IMediaServerService mediaServerService;
@Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
private MediaConfig mediaConfig;
+
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
@Override
public void run(String... strings) throws Exception {
- if (mediaServerService.getDefaultMediaServer() == null) {
+ mediaServerService.clearMediaServerForOnline();
+ MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
+ if (defaultMediaServer == null) {
mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
+ }else {
+ MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+ mediaSerItem.setId(defaultMediaServer.getId());
+ mediaServerService.updateToDatabase(mediaSerItem);
}
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
@@ -55,9 +70,18 @@
if (startGetMedia != null) {
startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
}
- mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+ mediaServerService.zlmServerOnline(zlmServerConfig);
}
});
+
+ // 璁㈤槄 zlm淇濇椿浜嬩欢, 褰搝lm绂荤嚎鏃跺仛涓氬姟鐨勫鐞�
+ hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_keepalive,null,
+ (MediaServerItem mediaServerItem, JSONObject response)->{
+ String mediaServerId = response.getString("mediaServerId");
+ if (mediaServerId !=null ) {
+ mediaServerService.updateMediaServerKeepalive(mediaServerId, response.getJSONObject("data"));
+ }
+ });
// 鑾峰彇zlm淇℃伅
logger.info("绛夊緟榛樿zlm鎺ュ叆...");
@@ -70,7 +94,9 @@
for (MediaServerItem mediaServerItem : all) {
if (startGetMedia == null) startGetMedia = new HashMap<>();
startGetMedia.put(mediaServerItem.getId(), true);
- connectZlmServer(mediaServerItem);
+ taskExecutor.execute(()->{
+ connectZlmServer(mediaServerItem);
+ });
}
Timer timer = new Timer();
// 2鍒嗛挓鍚庢湭杩炴帴鍒板垯涓嶅啀鍘讳富鍔ㄨ繛鎺�, TODO 骞跺閲嶅惎鍓嶄娇鐢ㄦ鍦▃lm鐨勯�氶亾鍙戦�乥ye
@@ -96,7 +122,7 @@
zlmServerConfig.setIp(mediaServerItem.getIp());
zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
startGetMedia.remove(mediaServerItem.getId());
- mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+ mediaServerService.zlmServerOnline(zlmServerConfig);
}
}
--
Gitblit v1.8.0