From a7e60e54a5bf0c98fa97e9536d59f0e5cca40d76 Mon Sep 17 00:00:00 2001
From: fangshunjian <fangshunjian@zdjizhi.com>
Date: Tue, 2 Apr 2019 14:40:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=98=9F=E5=88=97=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/nms/server/common/Common.java    | 8 ++++++--
 src/com/nms/server/common/Constants.java | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/com/nms/server/common/Common.java b/src/com/nms/server/common/Common.java
index f8b33e0..fd9b649 100644
--- a/src/com/nms/server/common/Common.java
+++ b/src/com/nms/server/common/Common.java
@@ -505,7 +505,10 @@ public class Common {
 		if(Constants.DEBUG_COMMON_ADDDETEDATA) {
 			logger.debug(new String(dsb));
 		}
-		DETE_DATA_QUEUE.add(dsb);
+		boolean add = DETE_DATA_QUEUE.add(dsb);
+		if(!add) {
+			logger.warn("监测数据添加失败");
+		}
 	}
 	
 	//无监测数据列表增加删除的同步操作
@@ -2867,8 +2870,9 @@ public class Common {
 	
 	/**
 	 * 2018年7月30日 修改监测数据存放位置，改为保存到队列 中
+	 * 2019年4月2日14:30:19 初始化默认大小 20000
 	 */
-	private static final LinkedBlockingDeque<byte[]> DETE_DATA_QUEUE = new LinkedBlockingDeque<byte[]>();
+	private static final LinkedBlockingDeque<byte[]> DETE_DATA_QUEUE = new LinkedBlockingDeque<byte[]>(Constants.DETE_DATA_QUEUE_CAPACITY);
 	
 	/**
 	 * 保存监测数据到缓存队列
diff --git a/src/com/nms/server/common/Constants.java b/src/com/nms/server/common/Constants.java
index fd9d39d..543dccd 100644
--- a/src/com/nms/server/common/Constants.java
+++ b/src/com/nms/server/common/Constants.java
@@ -498,6 +498,11 @@ public class Constants {
 	 */
 	public static final boolean PORT_ZERO_WARNING_FLAG;
 	
+	/**
+	 * 监测数据队列最大容量，防止nc长时间连接不上儿造成的dc短时间接收大量监测数据
+	 */
+	public static final Integer DETE_DATA_QUEUE_CAPACITY;
+	
 	static {
 		
 //		InetAddress inetAddress = null;
@@ -884,6 +889,10 @@ public class Constants {
 		
 		// 端口流量为 0 告警 功能
 		PORT_ZERO_WARNING_FLAG = Config.getBoolan("port.zero.warning.flag", false);
+		
+		//监测数据缓存队列容量
+		DETE_DATA_QUEUE_CAPACITY = Config.getInteger("dete.data.queue.capacity", 20000);
+		
 	}
 	
 	//文件传输 临时文件命名后缀