From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 394 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 228 insertions(+), 166 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 52c9f85..33c0051 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
@@ -1,27 +1,29 @@
package com.genersoft.iot.vmp.service.impl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.conf.ProxyServletConfig;
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.ZLMRunInfo;
import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
-import org.mitre.dsmiley.httpproxy.ProxyServlet;
+import com.genersoft.iot.vmp.utils.redis.JedisUtil;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@@ -31,15 +33,13 @@
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
*/
@Service
-public class MediaServerServiceImpl implements IMediaServerService {
+@Order(value=2)
+public class MediaServerServiceImpl implements IMediaServerService, CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
- private Map<String, IMediaServerItem> zlmServers = new HashMap<>(); // 鎵�鏈夋暟鎹簱鐨剒lm鐨勭紦瀛�
- private Map<String, Integer> zlmServerStatus = new LinkedHashMap<>(); // 鎵�鏈変笂绾跨殑zlm鐨勭紦瀛樹互鍙婅礋杞�
-
- @Value("${sip.ip}")
- private String sipIp;
+ @Autowired
+ private SipConfig sipConfig;
@Value("${server.ssl.enabled:false}")
private boolean sslEnabled;
@@ -56,7 +56,6 @@
@Autowired
private MediaServerMapper mediaServerMapper;
-
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -66,53 +65,140 @@
@Autowired
private ZLMRTPServerFactory zlmrtpServerFactory;
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Autowired
+ JedisUtil jedisUtil;
+
+ private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 鍒濆鍖�
*/
@Override
- public void init() {
- zlmServers.clear();
- zlmServerStatus.clear();
+ public void run(String... args) throws Exception {
+ logger.info("Media Server 缂撳瓨鍒濆鍖�");
List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
- for (IMediaServerItem mediaServerItem : mediaServerItemList) {
- zlmServers.put(mediaServerItem.getId(), mediaServerItem);
+ for (MediaServerItem mediaServerItem : mediaServerItemList) {
+ // 鏇存柊
+ if (mediaServerItem.getSsrcConfig() == null) {
+ SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
+ mediaServerItem.setSsrcConfig(ssrcConfig);
+ redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId(), mediaServerItem);
+ }
+ // 鏌ヨredis鏄惁瀛樺湪姝ediaServer
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+ if (!redisUtil.hasKey(key)) {
+ redisUtil.set(key, mediaServerItem);
+ }
+ }
+ }
+
+ @Override
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId) {
+ if (mediaServerItem == null || mediaServerItem.getId() == null) return null;
+ // 鑾峰彇mediaServer鍙敤鐨剆src
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+
+ SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
+ if (ssrcConfig == null) {
+ logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
+ return null;
+ }else {
+ String ssrc = ssrcConfig.getPlaySsrc();
+ if (streamId == null) streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ int rtpServerPort = mediaServerItem.getRtpProxyPort();
+ if (mediaServerItem.isRtpEnable()) {
+ rtpServerPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId);
+ }
+ redisUtil.set(key, mediaServerItem);
+ return new SSRCInfo(rtpServerPort, ssrc, streamId);
}
}
@Override
public void closeRTPServer(Device device, String channelId) {
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
- IMediaServerItem mediaServerItem = null;
- if (streamInfo != null) {
- mediaServerItem = this.getOne (streamInfo.getMediaServerId());
+ String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId);
+ MediaServerItem mediaServerItem = this.getOne(mediaServerId);
+ if (mediaServerItem != null) {
+ String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
+ zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
+ releaseSsrc(mediaServerItem, streamSession.getSSRC(device.getDeviceId(), channelId));
}
- String streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
- zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
streamSession.remove(device.getDeviceId(), channelId);
}
@Override
- public void update(MediaConfig mediaConfig) {
+ public void releaseSsrc(MediaServerItem mediaServerItem, String ssrc) {
+ if (mediaServerItem == null || ssrc == null) return;
+ SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
+ ssrcConfig.releaseSsrc(ssrc);
+ mediaServerItem.setSsrcConfig(ssrcConfig);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+ redisUtil.set(key, mediaServerItem);
+ }
+ /**
+ * zlm 閲嶅惎鍚庨噸缃粬鐨勬帹娴佷俊鎭紝 TODO 缁欐鍦ㄤ娇鐢ㄧ殑璁惧鍙戦�佸仠姝㈠懡浠�
+ * @param mediaServerItem
+ */
+ @Override
+ public void clearRTPServer(MediaServerItem mediaServerItem) {
+ mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain()));
+ redisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, mediaServerItem.getId(), 0);
+ }
+
+
+ @Override
+ public void update(MediaServerItem mediaSerItem) {
+ mediaServerMapper.update(mediaSerItem);
+ MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
+ MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
+ if (mediaServerItemInRedis != null && mediaServerItemInRedis.getSsrcConfig() != null) {
+ mediaServerItemInDataBase.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ }else {
+ mediaServerItemInDataBase.setSsrcConfig(
+ new SsrcConfig(
+ mediaServerItemInDataBase.getId(),
+ null,
+ sipConfig.getDomain()
+ )
+ );
+ }
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItemInDataBase.getId();
+ redisUtil.set(key, mediaServerItemInDataBase);
}
@Override
- public List<IMediaServerItem> getAll() {
- if (zlmServers.size() == 0) {
- init();
- }
- List<IMediaServerItem> result = new ArrayList<>();
- for (String id : zlmServers.keySet()) {
- IMediaServerItem mediaServerItem = zlmServers.get(id);
- mediaServerItem.setCount(zlmServerStatus.get(id) == null ? 0 : zlmServerStatus.get(id));
- result.add(mediaServerItem);
+ public List<MediaServerItem> getAll() {
+ List<MediaServerItem> result = new ArrayList<>();
+ List<Object> mediaServerKeys = redisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX));
+ for (int i = 0; i < mediaServerKeys.size(); i++) {
+ String key = (String) mediaServerKeys.get(i);
+ result.add((MediaServerItem)redisUtil.get(key));
}
return result;
+ }
-// return mediaServerMapper.queryAll();
+ @Override
+ public List<MediaServerItem> getAllFromDatabase() {
+ return mediaServerMapper.queryAll();
+ }
+
+ @Override
+ public List<MediaServerItem> getAllOnline() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ Set<String> mediaServerIdSet = redisUtil.zRevRange(key, 0, -1);
+ List<MediaServerItem> result = new ArrayList<>();
+ if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
+ for (String mediaServerId : mediaServerIdSet) {
+ String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerId;
+ result.add((MediaServerItem) redisUtil.get(serverKey));
+ }
+ }
+ return result;
}
/**
@@ -121,24 +207,26 @@
* @return MediaServerItem
*/
@Override
- public IMediaServerItem getOne(String mediaServerId) {
- if (mediaServerId ==null) return null;
- IMediaServerItem mediaServerItem = zlmServers.get(mediaServerId);
- if (mediaServerItem != null) {
- mediaServerItem.setCount(zlmServerStatus.get(mediaServerId) == null ? 0 : zlmServerStatus.get(mediaServerId));
- return mediaServerItem;
- }else {
- IMediaServerItem item = mediaServerMapper.queryOne(mediaServerId);
- if (item != null) {
- zlmServers.put(item.getId(), item);
- }
- return item;
- }
+ public MediaServerItem getOne(String mediaServerId) {
+ if (mediaServerId == null) return null;
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerId;
+ return (MediaServerItem)redisUtil.get(key);
}
@Override
- public IMediaServerItem getOneByHostAndPort(String host, int port) {
+ public MediaServerItem getOneByHostAndPort(String host, int port) {
return mediaServerMapper.queryOneByHostAndPort(host, port);
+ }
+
+ @Override
+ public void clearMediaServerForOnline() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ redisUtil.del(key);
+ }
+
+ @Override
+ public void add(MediaServerItem mediaSerItem) {
+ mediaServerMapper.add(mediaSerItem);
}
/**
@@ -150,111 +238,98 @@
logger.info("[ {} ]-[ {}:{} ]宸茶繛鎺�",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- IMediaServerItem serverItem = getOne(zlmServerConfig.getGeneralMediaServerId());
- String now = this.format.format(new Date(System.currentTimeMillis()));
- if (serverItem != null) {
- serverItem.setSecret(zlmServerConfig.getApiSecret());
- serverItem.setIp(zlmServerConfig.getIp());
+ MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
+ if (serverItem == null) {
+ serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
+ }
+ if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
+ || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
+ // 閰嶇疆鏂囦欢鐨剒lm
// 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
- // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙ｅ彿;
- // 鐩存帴缂栬瘧閮ㄧ讲鐨勪娇鐢ㄩ厤缃枃浠剁殑绔彛鍙凤紝濡傛灉zlm淇敼閰嶆敼浜嗛厤缃紝wvp鑷姩淇敼
-
- if (serverItem.getId().equals(mediaConfig.getId())
- || (serverItem.getIp().equals(mediaConfig.getIp()) && serverItem.getHttpPort() == mediaConfig.getHttpPort())) {
- // 閰嶇疆鏂囦欢鐨剒lm
- mediaConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaConfig.setUpdateTime(now);
- if (mediaConfig.getHttpPort() == 0) mediaConfig.setHttpPort(zlmServerConfig.getHttpPort());
- if (mediaConfig.getHttpSSlPort() == 0) mediaConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- if (mediaConfig.getRtmpPort() == 0) mediaConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
- if (mediaConfig.getRtmpSSlPort() == 0) mediaConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- if (mediaConfig.getRtspPort() == 0) mediaConfig.setRtspPort(zlmServerConfig.getRtspPort());
- if (mediaConfig.getRtspSSLPort() == 0) mediaConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- if (mediaConfig.getRtpProxyPort() == 0) mediaConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- mediaServerMapper.update(mediaConfig);
- serverItem = mediaConfig.getMediaSerItem();
- setZLMConfig(mediaConfig);
- }else {
- if (!serverItem.isDocker()) {
- serverItem.setHttpPort(zlmServerConfig.getHttpPort());
- serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- serverItem.setRtspPort(zlmServerConfig.getRtspPort());
-
+ // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙ｅ彿涓嶆槸榛樿鐨勫垯涓嶅仛鏇存柊锛� 閰嶇疆淇敼闇�瑕佽嚜琛屼慨鏀箂erver閰嶇疆;
+ MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
+ serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
+ if (mediaConfig.getHttpPort() == 0) serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
+ if (mediaConfig.getHttpSSlPort() == 0) serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+ if (mediaConfig.getRtmpPort() == 0) serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
+ if (mediaConfig.getRtmpSSlPort() == 0) serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ if (mediaConfig.getRtspPort() == 0) serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
+ if (mediaConfig.getRtspSSLPort() == 0) serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ if (mediaConfig.getRtpProxyPort() == 0) serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ if (serverItem != null){
+ mediaServerMapper.delDefault();
+ mediaServerMapper.add(serverItemFromConfig);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+ MediaServerItem serverItemInRedis = (MediaServerItem)redisUtil.get(key);
+ if (serverItemInRedis != null) {
+ serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
+ }else {
+ serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
}
- serverItem.setUpdateTime(now);
- mediaServerMapper.update(serverItem);
+ redisUtil.set(key, serverItemFromConfig);
+ }else {
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+ serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+ redisUtil.set(key, serverItemFromConfig);
+ mediaServerMapper.add(serverItemFromConfig);
+ }
+ resetOnlineServerItem(serverItemFromConfig);
+ setZLMConfig(serverItemFromConfig);
+ }else {
+ String now = this.format.format(System.currentTimeMillis());
+ if (serverItem == null){
+ // 涓�涓柊鐨剒lm鎺ュ叆wvp
+ serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
+ serverItem.setCreateTime(now);
+ serverItem.setUpdateTime(now);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
+ serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
+ redisUtil.set(key, serverItem);
+ // 瀛樺叆鏁版嵁搴�
+ mediaServerMapper.add(serverItem);
setZLMConfig(serverItem);
}
- }else {
- if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
- || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
- mediaConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaConfig.setCreateTime(now);
- mediaConfig.setUpdateTime(now);
- serverItem = mediaConfig.getMediaSerItem();
- mediaServerMapper.add(mediaConfig);
- }else {
- // 涓�涓柊鐨剒lm鎺ュ叆wvp
- serverItem = new MediaServerItem(zlmServerConfig, sipIp);
- serverItem.setCreateTime(now);
- serverItem.setUpdateTime(now);
- mediaServerMapper.add(serverItem);
- }
+ resetOnlineServerItem(serverItem);
}
- // 鏇存柊缂撳瓨
- if (zlmServerStatus.get(serverItem.getId()) == null) {
- zlmServers.put(serverItem.getId(), serverItem);
- zlmServerStatus.put(serverItem.getId(),0);
- }
- // 鏌ヨ鏈嶅姟娴佹暟閲�
- IMediaServerItem finalServerItem = serverItem;
- zlmresTfulUtils.getMediaList(serverItem, null, null, "rtmp",(mediaList ->{
- Integer code = mediaList.getInteger("code");
- if (code == 0) {
- JSONArray data = mediaList.getJSONArray("data");
- if (data != null) {
- zlmServerStatus.put(finalServerItem.getId(),data.size());
- }else {
- zlmServerStatus.put(finalServerItem.getId(),0);
- }
-
- }
- }));
-
}
- /**
- * 鏇存柊缂撳瓨
- * @param mediaServerItem zlm鏈嶅姟
- * @param count 鍦ㄧ嚎鏁�
- * @param online 鍦ㄧ嚎鐘舵��
- */
@Override
- public void updateServerCatch(IMediaServerItem mediaServerItem, Integer count, Boolean online) {
- if (mediaServerItem != null) {
- zlmServers.put(mediaServerItem.getId(), mediaServerItem);
- Collection<Integer> values = zlmServerStatus.values();
- if (online != null && count != null) {
- zlmServerStatus.put(mediaServerItem.getId(), count);
- }
+ public void resetOnlineServerItem(MediaServerItem serverItem) {
+ // 鏇存柊缂撳瓨
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ // 浣跨敤zset鐨勫垎鏁颁綔涓哄綋鍓嶅苟鍙戦噺锛� 榛樿鍊艰缃负0
+ if (redisUtil.zScore(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
+ redisUtil.zAdd(key, serverItem.getId(), 0L);
+ // 鏌ヨ鏈嶅姟娴佹暟閲�
+ zlmresTfulUtils.getMediaList(serverItem, null, null, "rtmp",(mediaList ->{
+ Integer code = mediaList.getInteger("code");
+ if (code == 0) {
+ JSONArray data = mediaList.getJSONArray("data");
+ if (data != null) {
+ redisUtil.zAdd(key, serverItem.getId(), data.size());
+ }
+ }
+ }));
+ }else {
+ clearRTPServer(serverItem);
}
+
}
+
@Override
public void addCount(String mediaServerId) {
- if (zlmServerStatus.get(mediaServerId) != null) {
- zlmServerStatus.put(mediaServerId, zlmServerStatus.get(mediaServerId) + 1);
- }
+ if (mediaServerId == null) return;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ Double aDouble = redisUtil.zScore(key, mediaServerId);
+ redisUtil.zIncrScore(key, mediaServerId, 1);
+
}
@Override
public void removeCount(String mediaServerId) {
- if (zlmServerStatus.get(mediaServerId) != null) {
- zlmServerStatus.put(mediaServerId, zlmServerStatus.get(mediaServerId) - 1);
- }
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ redisUtil.zIncrScore(key, mediaServerId, - 1);
}
/**
@@ -262,35 +337,20 @@
* @return MediaServerItem
*/
@Override
- public IMediaServerItem getMediaServerForMinimumLoad() {
- int mediaCount = -1;
- String key = null;
- System.out.println(JSON.toJSONString(zlmServerStatus));
- if (zlmServerStatus.size() == 1) {
- Map.Entry entry = zlmServerStatus.entrySet().iterator().next();
- key= (String) entry.getKey();
- }else {
- for (String id : zlmServerStatus.keySet()) {
- if (key == null) {
- key = id;
- mediaCount = zlmServerStatus.get(id);
- }
- if (zlmServerStatus.get(id) == 0) {
- key = id;
- break;
- }else if (mediaCount >= zlmServerStatus.get(id)){
- mediaCount = zlmServerStatus.get(id);
- key = id;
- }
- }
- }
+ public MediaServerItem getMediaServerForMinimumLoad() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
- if (key == null) {
+ if (redisUtil.zSize(key) == null || redisUtil.zSize(key) == 0) {
logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
return null;
- }else{
- return zlmServers.get(key);
}
+
+ // 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
+ Set<Object> objects = redisUtil.ZRange(key, 0, -1);
+ ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
+
+ String mediaServerId = (String)mediaServerObjectS.get(0);
+ return getOne(mediaServerId);
}
/**
@@ -298,7 +358,7 @@
* @param mediaServerItem 鏈嶅姟ID
*/
@Override
- public void setZLMConfig(IMediaServerItem mediaServerItem) {
+ public void setZLMConfig(MediaServerItem mediaServerItem) {
logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
@@ -325,7 +385,7 @@
param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS());
+ param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
@@ -333,8 +393,10 @@
logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}else {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm澶辫触" + responseJSON.getString("msg"),
+ logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm澶辫触",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
}
+
+
}
--
Gitblit v1.8.0