From a209d173904843eee90e689c7431eb97c6e7bac6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 11:29:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
index 3cdf48d..59fa8f6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
@@ -12,7 +12,7 @@
*/
public class DefaultProperties {
- public static Properties getProperties(String ip, boolean isDebug, boolean sipLog) {
+ public static Properties getProperties(String ip, boolean sipLog) {
Properties properties = new Properties();
properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
properties.setProperty("javax.sip.IP_ADDRESS", ip);
@@ -25,9 +25,6 @@
*/
// * gov/nist/javax/sip/SipStackImpl.class
- if (isDebug) {
- properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
- }
// 鎺ユ敹鎵�鏈塶otify璇锋眰锛屽嵆浣挎病鏈夎闃�
properties.setProperty("gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY", "true");
properties.setProperty("gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING", "false");
@@ -50,29 +47,13 @@
*/
Logger logger = LoggerFactory.getLogger(AlarmNotifyMessageHandler.class);
if (sipLog) {
- if (logger.isDebugEnabled()) {
- System.out.println("DEBUG");
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "DEBUG");
- }else if (logger.isInfoEnabled()) {
- System.out.println("INFO1");
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "INFO");
- }else if (logger.isWarnEnabled()) {
- System.out.println("WARNING");
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "WARNING");
- }else if (logger.isErrorEnabled()) {
- System.out.println("ERROR");
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "ERROR");
- }else {
- System.out.println("INFO2");
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "INFO");
- }
- logger.info("[SIP鏃ュ織]绾у埆涓�: {}", properties.getProperty("gov.nist.javax.sip.TRACE_LEVEL"));
+ properties.setProperty("gov.nist.javax.sip.STACK_LOGGER", "com.genersoft.iot.vmp.gb28181.conf.StackLoggerImpl");
+ properties.setProperty("gov.nist.javax.sip.SERVER_LOGGER", "com.genersoft.iot.vmp.gb28181.conf.ServerLoggerImpl");
+ properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "true");
+ logger.info("[SIP鏃ュ織]宸插紑鍚�");
}else {
logger.info("[SIP鏃ュ織]宸插叧闂�");
}
-
-
-
return properties;
}
}
--
Gitblit v1.8.0