From bf8fb0c51f4e7894a62636dede6c69a2a85d8458 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 27 四月 2021 15:35:22 +0800
Subject: [PATCH] 添加级联平台自动注册时失败自动重新注册
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 2ef4cf6..2bbc1be 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
@@ -154,23 +154,32 @@
* zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
*/
private void zLmRunning(MediaServerConfig mediaServerConfig){
- logger.info("zlm鎺ュ叆鎴愬姛...");
+ logger.info( "[ id: " + mediaServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
if (autoConfig) saveZLMConfig();
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
if (mediaInfo != null && System.currentTimeMillis() - mediaInfo.getUpdateTime() < 50){
- logger.info("zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
+ logger.info("[ id: " + mediaServerConfig.getGeneralMediaServerId() + "]zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
return;
}
mediaServerConfig.setLocalIP(mediaIp);
mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
redisCatchStorage.updateMediaInfo(mediaServerConfig);
+
+ // 娓呯┖鎵�鏈塻ession
+// zlmMediaListManager.clearAllSessions();
+
// 鏇存柊娴佸垪琛�
zlmMediaListManager.updateMediaList();
// 鎭㈠娴佷唬鐞�
List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
- streamProxyService.addStreamProxyToZlm(streamProxyDto);
+ JSONObject jsonObject = streamProxyService.addStreamProxyToZlm(streamProxyDto);
+ if (jsonObject == null) {
+ // 璁剧疆涓烘湭鍚敤
+ logger.info("鎭㈠娴佷唬鐞嗗け璐ワ紝璇锋鏌ユ祦鍦板潃鍚庨噸鏂板惎鐢�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ streamProxyService.stop(streamProxyDto.getApp(), streamProxyDto.getStream());
+ }
}
}
}
--
Gitblit v1.8.0