From e66b83965943e8471d5e2fb616899e0c8271e840 Mon Sep 17 00:00:00 2001
From: ydpd <ydpd@163.com>
Date: 星期三, 02 三月 2022 00:02:03 +0800
Subject: [PATCH] 修改内存泄露
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
index 4245bdd..4644fb0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
@@ -1,11 +1,14 @@
package com.genersoft.iot.vmp.gb28181.event;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.sip.*;
+import javax.sip.header.CallIdHeader;
+import javax.sip.message.Response;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
@@ -20,23 +23,35 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> timeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>();
// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
+// @Scheduled(fixedRate= 100 * 60 * 60 )
@Scheduled(cron="0 0 * * * ?") //姣忓皬鏃舵墽琛屼竴娆★紝 姣忎釜鏁寸偣
public void execute(){
logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭�");
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1);
- for (String key : timeSubscribes.keySet()) {
- if (timeSubscribes.get(key).before(calendar.getTime())){
+ for (String key : okTimeSubscribes.keySet()) {
+ if (okTimeSubscribes.get(key).before(calendar.getTime())){
logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
- errorSubscribes.remove(key);
okSubscribes.remove(key);
- timeSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
}
}
+ for (String key : errorTimeSubscribes.keySet()) {
+ if (errorTimeSubscribes.get(key).before(calendar.getTime())){
+ logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ errorSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
+ }
+ }
+ logger.info("okTimeSubscribes.size:{}",okTimeSubscribes.size());
+ logger.info("okSubscribes.size:{}",okSubscribes.size());
+ logger.info("errorTimeSubscribes.size:{}",errorTimeSubscribes.size());
+ logger.info("errorSubscribes.size:{}",errorSubscribes.size());
}
public interface Event {
@@ -58,11 +73,15 @@
this.event = event;
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
- this.type = "response";
- this.msg = responseEvent.getResponse().getReasonPhrase();
- this.statusCode = responseEvent.getResponse().getStatusCode();
- this.callId = responseEvent.getDialog().getCallId().getCallId();
- this.dialog = responseEvent.getDialog();
+ Response response = responseEvent.getResponse();
+ this.dialog = responseEvent.getDialog();
+ this.type = "response";
+ if (response != null) {
+ this.msg = response.getReasonPhrase();
+ this.statusCode = response.getStatusCode();
+ }
+ this.callId = ((CallIdHeader)response.getHeader(CallIdHeader.NAME)).getCallId();
+
}else if (event instanceof TimeoutEvent) {
TimeoutEvent timeoutEvent = (TimeoutEvent)event;
this.type = "timeout";
@@ -84,6 +103,13 @@
this.statusCode = -1024;
this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
this.dialog = dialogTerminatedEvent.getDialog();
+ }else if (event instanceof DeviceNotFoundEvent) {
+ DeviceNotFoundEvent deviceNotFoundEvent = (DeviceNotFoundEvent)event;
+ this.type = "deviceNotFoundEvent";
+ this.msg = "璁惧鏈壘鍒�";
+ this.statusCode = -1024;
+ this.callId = deviceNotFoundEvent.getDialog().getCallId().getCallId();
+ this.dialog = deviceNotFoundEvent.getDialog();
}
}
}
--
Gitblit v1.8.0