Commit 2bf7cdc2df8482b775c05e783e49f3bb7ec58da5
1 parent
95d36770
【zlm心跳hook】重复查询redis了
变量也不需要多次定义 数据库有的话应该恢复zlm
Showing
1 changed file
with
3 additions
and
9 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
| @@ -644,19 +644,13 @@ public class MediaServerServiceImpl implements IMediaServerService { | @@ -644,19 +644,13 @@ public class MediaServerServiceImpl implements IMediaServerService { | ||
| 644 | MediaServerItem mediaServerItem = getOne(mediaServerId); | 644 | MediaServerItem mediaServerItem = getOne(mediaServerId); |
| 645 | if (mediaServerItem == null) { | 645 | if (mediaServerItem == null) { |
| 646 | // 缓存不存在，从数据库查询，如果数据库不存在则是错误的 | 646 | // 缓存不存在，从数据库查询，如果数据库不存在则是错误的 |
| 647 | - MediaServerItem mediaServerItemFromDatabase = getOneFromDatabase(mediaServerId); | ||
| 648 | - if (mediaServerItemFromDatabase == null) { | ||
| 649 | - return; | ||
| 650 | - } | ||
| 651 | - // zlm连接重试 | ||
| 652 | - logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息,尝试重连zlm"); | ||
| 653 | -// reloadZlm(); | ||
| 654 | - mediaServerItem = getOne(mediaServerId); | 647 | + mediaServerItem = getOneFromDatabase(mediaServerId); |
| 655 | if (mediaServerItem == null) { | 648 | if (mediaServerItem == null) { |
| 656 | - // zlm连接重试 | ||
| 657 | logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息"); | 649 | logger.warn("[更新ZLM 保活信息]失败，未找到流媒体信息"); |
| 658 | return; | 650 | return; |
| 659 | } | 651 | } |
| 652 | + // zlm连接重试 | ||
| 653 | + logger.warn("[更新ZLM 保活信息]尝试链接默认zml"); | ||
| 660 | } | 654 | } |
| 661 | final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId(); | 655 | final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId(); |
| 662 | dynamicTask.stop(zlmKeepaliveKey); | 656 | dynamicTask.stop(zlmKeepaliveKey); |