Commit 1950e0d852d5cad9af5c127ffa4e96188d5fa10c

Authored by 李 俊亮
Committed by xp.Huang
1 parent ffdc1c9a

perf: 异常日志策略调整

... ... @@ -159,7 +159,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
159 159 CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
160 160 String methodName = cseqHeader.getMethod();
161 161 SIPResponse request = (SIPResponse) responseEvent.getResponse();
162   - log.info(
  162 + log.debug(
163 163 "收到ResponseEvent,方法类型【{}】,状态码【{}】,事件内容【{}】",
164 164 methodName,
165 165 status,
... ... @@ -176,7 +176,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
176 176 case BYE:
177 177 break;
178 178 default:
179   - log.info("不支持的响应类型【{}】", method);
  179 + log.debug("不支持的响应类型【{}】", method);
180 180 }
181 181 if (status != Response.UNAUTHORIZED && responseEvent.getResponse() != null && sipSubscribe.getOkSubscribesSize() > 0 ) {
182 182 CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
... ... @@ -192,7 +192,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
192 192 } else if ((status >= Response.TRYING) && (status < Response.OK)) {
193 193 // 增加其它无需回复的响应,如101、180等
194 194 } else {
195   - log.error("收到ResponseEvent,状态码【{}】,失败原因【{}】", status, response.getReasonPhrase());
  195 + log.error("收到ResponseEvent,设备【{}】,状态码【{}】,失败原因【{}】,ResponseEvent内容【{}】",response.getHeader(FromHeader.NAME),status, response.getReasonPhrase(),response.getRawContent() == null ? null : new String(response.getRawContent()));
196 196 if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
197 197 CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
198 198 if (callIdHeader != null) {
... ... @@ -219,7 +219,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
219 219 public void processRequest(RequestEvent requestEvent) {
220 220 String methodName = requestEvent.getRequest().getMethod();
221 221 SIPRequest request = (SIPRequest) requestEvent.getRequest();
222   - log.info(
  222 + log.debug(
223 223 "收到RequestEvent,方法类型【{}】,事件内容【{}】",
224 224 methodName,
225 225 request.getRawContent() == null ? null : new String(request.getRawContent()));
... ... @@ -350,7 +350,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
350 350 }
351 351 String cmdType = TKXmlUtil.getText(rootElement, "CmdType");
352 352 VideoXmlEnum msgType = VideoXmlEnum.valueOf(rootElement.getName());
353   - log.error(
  353 + log.trace(
354 354 "SIP服务器【{}】处理设备【{}】请求消息,方法类型【{}】,MESSAGE类型【{}】,命令类型【{}】请求内容【{}】",
355 355 request.getLocalAddress(),
356 356 request.getRemoteAddress(),
... ... @@ -409,7 +409,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
409 409 // 第一次注册,返回401
410 410 AuthorizationHeader authHead =
411 411 (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
412   - log.error(
  412 + log.debug(
413 413 "SIP服务器【{}】收到设备【{}】请求事件,类型【{}】鉴权头不存在【{}】密码【{}】",
414 414 request.getLocalAddress(),
415 415 request.getRemoteAddress(),
... ... @@ -948,7 +948,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
948 948
949 949 try {
950 950 SIPResponse response = (SIPResponse) evt.getResponse();
951   - log.error(
  951 + log.trace(
952 952 "SIP服务器【{}】处理设备【{}】响应事件,类型【{}】内容【{}】",
953 953 response.getLocalAddress(),
954 954 response.getRemoteAddress(),
... ...
... ... @@ -44,7 +44,7 @@ public class SIPSender {
44 44 public void transmitRequest(
45 45 String ip, Message message, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent)
46 46 throws SipException {
47   - log.error("SIP服务器【{}】往设备推送消息【{}】内容【{}】", ip,message.getClass().getName(), message);
  47 + log.trace("SIP服务器【{}】往设备推送消息【{}】内容【{}】", ip,message.getClass().getName(), message);
48 48 ViaHeader viaHeader = (ViaHeader) message.getHeader(ViaHeader.NAME);
49 49 String transport = UDP;
50 50 if (viaHeader == null) {
... ...
... ... @@ -257,6 +257,24 @@ public class TKXmlUtil {
257 257 if (nameElement != null) {
258 258 deviceChannel.setName(nameElement.getText());
259 259 }
  260 +
  261 + // 设备状态
  262 + String status = getText(itemDevice, "Status");
  263 + if (status != null) {
  264 + // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
  265 + if (status.equals("ON")
  266 + || status.equals("On")
  267 + || status.equals("ONLINE")
  268 + || status.equals("OK")) {
  269 + deviceChannel.setStatus(StatusEnum.ONLINE);
  270 + }
  271 + if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
  272 + deviceChannel.setStatus(StatusEnum.OFFLINE);
  273 + }
  274 + } else {
  275 + deviceChannel.setStatus(StatusEnum.ONLINE);
  276 + }
  277 +
260 278 if (channelId.length() <= 8) {
261 279 deviceChannel.setHasAudio(false);
262 280 String parentCode = getParentCivilCode(channelId);
... ... @@ -266,7 +284,6 @@ public class TKXmlUtil {
266 284 } else {
267 285 log.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
268 286 }
269   - deviceChannel.setStatus(StatusEnum.ONLINE);
270 287 return deviceChannel;
271 288 } else {
272 289 if (channelId.length() != 20) {
... ... @@ -503,23 +520,6 @@ public class TKXmlUtil {
503 520 deviceChannel.setPassword(password);
504 521 }
505 522
506   - // 设备状态
507   - String status = getText(itemDevice, "Status");
508   - if (status != null) {
509   - // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
510   - if (status.equals("ON")
511   - || status.equals("On")
512   - || status.equals("ONLINE")
513   - || status.equals("OK")) {
514   - deviceChannel.setStatus(StatusEnum.ONLINE);
515   - }
516   - if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
517   - deviceChannel.setStatus(StatusEnum.OFFLINE);
518   - }
519   - } else {
520   - deviceChannel.setStatus(StatusEnum.ONLINE);
521   - }
522   -
523 523 // 经度
524 524 String longitude = getText(itemDevice, "Longitude");
525 525 if (DataUtils.isDouble(longitude)) {
... ...