From 04af6de363b8d420eb244e289817277ea2bcc5d4 Mon Sep 17 00:00:00 2001
From: panll <m18010473990@163.com>
Date: 星期六, 17 十月 2020 16:41:40 +0800
Subject: [PATCH] 修改默认参数与ZLM统一

---
 src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 9cc9c25..d12f832 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -2,22 +2,12 @@
 
 import java.text.ParseException;
 import java.util.Properties;
+import java.util.TooManyListenersException;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import javax.sip.DialogTerminatedEvent;
-import javax.sip.IOExceptionEvent;
-import javax.sip.ListeningPoint;
-import javax.sip.PeerUnavailableException;
-import javax.sip.RequestEvent;
-import javax.sip.ResponseEvent;
-import javax.sip.SipFactory;
-import javax.sip.SipListener;
-import javax.sip.SipProvider;
-import javax.sip.SipStack;
-import javax.sip.TimeoutEvent;
-import javax.sip.TransactionTerminatedEvent;
+import javax.sip.*;
 import javax.sip.message.Response;
 
 import org.slf4j.Logger;
@@ -54,14 +44,14 @@
 	private ThreadPoolExecutor processThreadPool;
 
 	@Bean("initSipServer")
-	@DependsOn("allOffline")
-	private void initSipServer() {
+	private ThreadPoolExecutor initSipServer() {
 		
 		int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;
 		LinkedBlockingQueue<Runnable> processQueue = new LinkedBlockingQueue<Runnable>(10000);
 		processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,
 				0L,TimeUnit.MILLISECONDS,processQueue,
 				new ThreadPoolExecutor.CallerRunsPolicy());
+		return processThreadPool;
 	}
 	
 	@Bean("sipFactory")
@@ -93,11 +83,17 @@
 
 	@Bean("tcpSipProvider")
 	@DependsOn("sipStack")
-	private SipProvider startTcpListener() throws Exception {
-		ListeningPoint tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "TCP");
-		SipProvider tcpSipProvider = sipStack.createSipProvider(tcpListeningPoint);
-		tcpSipProvider.addSipListener(this);
-		logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
+	private SipProvider startTcpListener() {
+		ListeningPoint tcpListeningPoint = null;
+		SipProvider tcpSipProvider  = null;
+		try {
+			tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "TCP");
+			tcpSipProvider = sipStack.createSipProvider(tcpListeningPoint);
+			tcpSipProvider.addSipListener(this);
+			logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
+		} catch (TransportNotSupportedException | InvalidArgumentException | TooManyListenersException | ObjectInUseException e) {
+			logger.error(String.format("鍒涘缓SIP鏈嶅姟澶辫触: %s", e.getMessage()));
+		}
 		return tcpSipProvider;
 	}
 	

--
Gitblit v1.8.0