From 81049b5a9ec89eb8e3ec2eacd051bc68a162ced4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 25 Jun 2024 17:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/service/impl/StreamPushServiceImpl.java | 2 +- .../redisMsg/RedisCloseStreamMsgListener.java | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java index aa7296ed..2f159336 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java @@ -231,7 +231,7 @@ public class StreamPushServiceImpl implements IStreamPushService { @Override public boolean stop(String app, String stream) { - logger.info("[推流] 停止流： {}/{}", app, stream); + logger.info("[推流] 停止推流： {}/{}", app, stream); StreamPush streamPushItem = streamPushMapper.selectOne(app, stream); if (streamPushItem != null) { gbStreamService.sendCatalogMsg(streamPushItem, CatalogEvent.DEL); diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisCloseStreamMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisCloseStreamMsgListener.java index d0104756..38eb5344 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisCloseStreamMsgListener.java +++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisCloseStreamMsgListener.java @@ -3,9 +3,8 @@ package com.genersoft.iot.vmp.service.redisMsg; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.genersoft.iot.vmp.service.IStreamPushService; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.connection.Message; @@ -17,14 +16,13 @@ import java.util.concurrent.ConcurrentLinkedQueue; /** * 接收来自redis的关闭流更新通知 + * 消息举例： PUBLISH VM_MSG_STREAM_PUSH_CLOSE "{'app': 'live', 'stream': 'stream'}" * @author lin */ +@Slf4j @Component public class RedisCloseStreamMsgListener implements MessageListener { - private final static Logger logger = LoggerFactory.getLogger(RedisCloseStreamMsgListener.class); - - @Autowired private IStreamPushService pushService; @@ -47,10 +45,9 @@ public class RedisCloseStreamMsgListener implements MessageListener { String app = jsonObject.getString("app"); String stream = jsonObject.getString("stream"); pushService.stop(app, stream); - }catch (Exception e) { - logger.warn("[REDIS的关闭推流通知] 发现未处理的异常, \r\n{}", JSON.toJSONString(message)); - logger.error("[REDIS的关闭推流通知] 异常内容： ", e); + log.warn("[REDIS的关闭推流通知] 发现未处理的异常, \r\n{}", JSON.toJSONString(message)); + log.error("[REDIS的关闭推流通知] 异常内容： ", e); } } });