guzijian / wvp-GB28181-pro · Commits

Commit f3454caaf6241c44e82704711a3a1efe264f400f

Authored by 648540858
Committed by GitHub
2 parents 662a70e2 d6fe626b

Merge pull request #647 from L120820/wvp-28181-2.0 

【zlm心跳hook】重复查询redis了
Inline Side-by-side
Showing 1 changed file with 8 additions and 9 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @f3454ca
... ... @@ -649,19 +649,18 @@ public class MediaServerServiceImpl implements IMediaServerService {
649 649 MediaServerItem mediaServerItem = getOne(mediaServerId);
650 650 if (mediaServerItem == null) {
651 651 // 缓存不存在，从数据库查询，如果数据库不存在则是错误的
652   - MediaServerItem mediaServerItemFromDatabase = getOneFromDatabase(mediaServerId);
653   - if (mediaServerItemFromDatabase == null) {
654   - return;
655   - }
656   - // zlm连接重试
657   - logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息,尝试重连zlm");
658   -// reloadZlm();
659   - mediaServerItem = getOne(mediaServerId);
  652 + mediaServerItem = getOneFromDatabase(mediaServerId);
660 653 if (mediaServerItem == null) {
661   - // zlm连接重试
662 654 logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息");
663 655 return;
664 656 }
  657 + // zlm连接重试
  658 + logger.warn("[更新ZLM 保活信息]尝试链接zml id {}", mediaServerId);
  659 + SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
  660 + mediaServerItem.setSsrcConfig(ssrcConfig);
  661 + String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
  662 + RedisUtil.set(key, mediaServerItem);
  663 + clearRTPServer(mediaServerItem);
665 664 }
666 665 final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
667 666 dynamicTask.stop(zlmKeepaliveKey);
... ...