Showing
3 changed files
with
16 additions
and
7 deletions
... | ... | @@ -997,13 +997,22 @@ public class DefaultTransportApiService implements TransportApiService { |
997 | 997 | log.info("启动流媒体【ZLMedia】验证,流媒体编号【{}】", mediaServerItem.getMediaServerId()); |
998 | 998 | JsonNode responseJson = zlMediaKitRestFulUtils.getMediaServerConfig(mediaServerItem); |
999 | 999 | if (responseJson == null) { |
1000 | - log.trace( | |
1000 | + log.error( | |
1001 | 1001 | "流媒体【{}】服务地址【{}:{}】无法访问", |
1002 | 1002 | mediaServerItem.getMediaServerId(), |
1003 | 1003 | mediaServerItem.getIp(), |
1004 | 1004 | mediaServerItem.getHttpPort()); |
1005 | 1005 | return null; |
1006 | 1006 | } |
1007 | + JsonNode code = responseJson.get(FastIotConstants.ZLMediaBody.CODE); | |
1008 | + if(code !=null && code.asText().equals("-100")){ | |
1009 | + log.error( | |
1010 | + "流媒体【{}:{}】调用失败,失败原因【{}】", | |
1011 | + mediaServerItem.getIp(), | |
1012 | + mediaServerItem.getHttpPort(), | |
1013 | + responseJson.get(FastIotConstants.ZLMediaBody.MSG)); | |
1014 | + return null; | |
1015 | + } | |
1007 | 1016 | JsonNode data = responseJson.get(FastIotConstants.ZLMediaBody.DATA); |
1008 | 1017 | if (data != null && !data.isEmpty()) { |
1009 | 1018 | log.info( |
... | ... | @@ -1011,7 +1020,7 @@ public class DefaultTransportApiService implements TransportApiService { |
1011 | 1020 | return org.thingsboard.server.common.data.yunteng.utils.JacksonUtil.convertValue( |
1012 | 1021 | data.get(0), ZLMediaKitServerConfig.class); |
1013 | 1022 | } else { |
1014 | - log.trace( | |
1023 | + log.error( | |
1015 | 1024 | "流媒体【{}:{}】调用失败,失败原因【{}】", |
1016 | 1025 | mediaServerItem.getIp(), |
1017 | 1026 | mediaServerItem.getHttpPort(), | ... | ... |
... | ... | @@ -95,7 +95,7 @@ public class TkMediaServerNodeServiceImpl implements TkMediaServerNodeService { |
95 | 95 | serverId, |
96 | 96 | zlmServerConfig.getIp(), |
97 | 97 | zlmServerConfig.getHttpPort()); |
98 | - log.warn("请检查ZLM的<general.mediaServerId>配置是否与WVP的<media.id>一致"); | |
98 | + log.warn("请检查ZLM的<general.mediaServerId>配置是否与配置文件的<media.id>一致"); | |
99 | 99 | return; |
100 | 100 | } else { |
101 | 101 | log.info( |
... | ... | @@ -169,7 +169,7 @@ public class TkMediaServerNodeServiceImpl implements TkMediaServerNodeService { |
169 | 169 | public void zlmServerOffline(String medisServerId) { |
170 | 170 | MediaServerDTO serverItem = tkMediaServerService.findMediaServerInfoById(null, medisServerId); |
171 | 171 | if (serverItem == null) { |
172 | - log.warn("请检查ZLM的<general.mediaServerId>配置是否与WVP的<media.id>一致"); | |
172 | + log.warn("请检查ZLM的<general.mediaServerId>配置是否与配置文件的<media.id>一致"); | |
173 | 173 | return; |
174 | 174 | } |
175 | 175 | serverItem.setStatus(false); | ... | ... |
... | ... | @@ -713,7 +713,7 @@ public class TkMediaServerServiceImpl |
713 | 713 | JsonNode responseJSON = zlMediaKitRestFulUtils.setServerConfig(mediaServerItem, param); |
714 | 714 | if (responseJSON != null && responseJSON.get("code").intValue() == 0) { |
715 | 715 | if (restart) { |
716 | - log.error( | |
716 | + log.info( | |
717 | 717 | "[ZLM] 设置成功,开始重启以保证配置生效 {} -> {}:{}【{}】", |
718 | 718 | mediaServerItem.getId(), |
719 | 719 | mediaServerItem.getIp(), |
... | ... | @@ -721,7 +721,7 @@ public class TkMediaServerServiceImpl |
721 | 721 | param); |
722 | 722 | zlMediaKitRestFulUtils.restartServer(mediaServerItem); |
723 | 723 | } else { |
724 | - log.error( | |
724 | + log.info( | |
725 | 725 | "[ZLM] 设置成功 {} -> {}:{}【{}】", |
726 | 726 | mediaServerItem.getId(), |
727 | 727 | mediaServerItem.getIp(), |
... | ... | @@ -729,7 +729,7 @@ public class TkMediaServerServiceImpl |
729 | 729 | param); |
730 | 730 | } |
731 | 731 | } else { |
732 | - log.info( | |
732 | + log.error( | |
733 | 733 | "[ZLM] 设置zlm失败 {} -> {}:{}", |
734 | 734 | mediaServerItem.getId(), |
735 | 735 | mediaServerItem.getIp(), | ... | ... |