fix: 系统启动时,停止已启动国标推流抛出异常被系统捕获,启动服务失败。
parent
69c81b3b96
commit
6e8071d820
|
@ -104,7 +104,7 @@ public class SipRunner implements CommandLineRunner {
|
||||||
redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(),sendRtpItem.getChannelId(), sendRtpItem.getCallId(),sendRtpItem.getStream());
|
redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(),sendRtpItem.getChannelId(), sendRtpItem.getCallId(),sendRtpItem.getStream());
|
||||||
if (mediaServerItem != null) {
|
if (mediaServerItem != null) {
|
||||||
ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());
|
ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());
|
||||||
boolean stopResult = mediaServerService.stopSendRtp(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
|
boolean stopResult = mediaServerService.initStopSendRtp(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
|
||||||
if (stopResult) {
|
if (stopResult) {
|
||||||
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
|
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
|
||||||
if (platform != null) {
|
if (platform != null) {
|
||||||
|
|
|
@ -29,6 +29,8 @@ public interface IMediaNodeServerService {
|
||||||
|
|
||||||
boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
||||||
|
|
||||||
|
boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
||||||
|
|
||||||
boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName);
|
boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName);
|
||||||
|
|
||||||
List<StreamInfo> getMediaList(MediaServer mediaServer, String app, String stream, String callId);
|
List<StreamInfo> getMediaList(MediaServer mediaServer, String app, String stream, String callId);
|
||||||
|
|
|
@ -76,6 +76,8 @@ public interface IMediaServerService {
|
||||||
|
|
||||||
boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
||||||
|
|
||||||
|
boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc);
|
||||||
|
|
||||||
boolean deleteRecordDirectory(MediaServer mediaServerItem, String app, String stream, String date, String fileName);
|
boolean deleteRecordDirectory(MediaServer mediaServerItem, String app, String stream, String date, String fileName);
|
||||||
|
|
||||||
List<StreamInfo> getMediaList(MediaServer mediaInfo, String app, String stream, String callId);
|
List<StreamInfo> getMediaList(MediaServer mediaInfo, String app, String stream, String callId);
|
||||||
|
|
|
@ -595,6 +595,16 @@ public class MediaServerServiceImpl implements IMediaServerService {
|
||||||
return mediaNodeServerService.stopSendRtp(mediaInfo, app, stream, ssrc);
|
return mediaNodeServerService.stopSendRtp(mediaInfo, app, stream, ssrc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
|
||||||
|
IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaInfo.getType());
|
||||||
|
if (mediaNodeServerService == null) {
|
||||||
|
logger.info("[stopSendRtp] 失败, mediaServer的类型: {},未找到对应的实现类", mediaInfo.getType());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return mediaNodeServerService.initStopSendRtp(mediaInfo, app, stream, ssrc);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
|
public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
|
||||||
IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
|
IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
|
||||||
|
|
|
@ -144,6 +144,23 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
|
||||||
|
Map<String, Object> param = new HashMap<>();
|
||||||
|
param.put("vhost", "__defaultVhost__");
|
||||||
|
param.put("app", app);
|
||||||
|
param.put("stream", stream);
|
||||||
|
if (!ObjectUtils.isEmpty(ssrc)) {
|
||||||
|
param.put("ssrc", ssrc);
|
||||||
|
}
|
||||||
|
JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(mediaInfo, param);
|
||||||
|
if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
|
||||||
|
logger.error("停止发流失败: {}, 参数:{}", jsonObject.getString("msg"), JSON.toJSONString(param));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
|
public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
|
||||||
logger.info("[zlm-deleteRecordDirectory] 删除磁盘文件, server: {} {}:{}->{}/{}", mediaServer.getId(), app, stream, date, fileName);
|
logger.info("[zlm-deleteRecordDirectory] 删除磁盘文件, server: {} {}:{}->{}/{}", mediaServer.getId(), app, stream, date, fileName);
|
||||||
|
|
Loading…
Reference in New Issue