From 724b288232e1614de1b789d0910fe3e3db765e52 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期三, 04 八月 2021 18:00:22 +0800
Subject: [PATCH] 优化内存溢出的问题 优化zlm集群默认zlm的存储 添加报警的存储以及相关接口 添加单元测试
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 67b605c..187cbc1 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
@@ -45,18 +45,18 @@
mediaServerService.clearMediaServerForOnline();
// 灏嗛厤缃枃浠剁殑meida閰嶇疆鍐欏叆鏁版嵁搴�
- MediaServerItem presetMediaServer = mediaServerService.getOneByHostAndPort(
- mediaConfig.getIp(), mediaConfig.getHttpPort());
- if (presetMediaServer != null) {
- MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
- mediaSerItem.setId(presetMediaServer.getId());
- mediaServerService.update(mediaSerItem);
- }else {
- if (mediaConfig.getId() != null) {
- MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
- mediaServerService.add(mediaSerItem);
- }
- }
+// MediaServerItem presetMediaServer = mediaServerService.getOneByHostAndPort(
+// mediaConfig.getIp(), mediaConfig.getHttpPort());
+// if (presetMediaServer != null) {
+// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+// mediaSerItem.setId(presetMediaServer.getId());
+// mediaServerService.update(mediaSerItem);
+// }else {
+// if (mediaConfig.getId() != null) {
+// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+// mediaServerService.add(mediaSerItem);
+// }
+// }
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,
@@ -73,8 +73,8 @@
logger.info("绛夊緟榛樿zlm鎺ュ叆...");
// 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
- List<MediaServerItem> all = mediaServerService.getAll();
- if (presetMediaServer == null) {
+ List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
+ if (all.size() == 0) {
all.add(mediaConfig.getMediaSerItem());
}
for (MediaServerItem mediaServerItem : all) {
@@ -99,14 +99,16 @@
Set<String> allZlmId = startGetMedia.keySet();
for (String id : allZlmId) {
logger.error("[ {} ]]涓诲姩杩炴帴澶辫触锛屼笉鍐嶄富鍔ㄨ繛鎺�", id);
- startGetMedia.put(id, false);
}
+ startGetMedia = null;
}
+ // TODO 娓呯悊鏁版嵁搴撲腑涓巖edis涓嶅尮閰嶇殑zlm
}
}, 60 * 1000 * 2);
}
public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
+ if (startGetMedia == null) return null;
if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) return null;
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
ZLMServerConfig ZLMServerConfig = null;
--
Gitblit v1.8.0