Commit 86f87c4665e0c3c9c2723c32c0615f85ca4b0a7c
1 parent
e66b8396
修改内存泄露
Showing
1 changed file
with
10 additions
and
9 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
| @@ -26,24 +26,25 @@ public class SipSubscribe { | @@ -26,24 +26,25 @@ public class SipSubscribe { | ||
| 26 | private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>(); | 26 | private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>(); |
| 27 | private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>(); | 27 | private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>(); |
| 28 | 28 | ||
| 29 | -// @Scheduled(cron="*/5 * * * * ?") //每五秒执行一次 | 29 | + // @Scheduled(cron="*/5 * * * * ?") //每五秒执行一次 |
| 30 | // @Scheduled(fixedRate= 100 * 60 * 60 ) | 30 | // @Scheduled(fixedRate= 100 * 60 * 60 ) |
| 31 | - @Scheduled(cron="0 0 * * * ?") //每小时执行一次, 每个整点 | 31 | + @Scheduled(cron="0 0/5 * * * ?") //每5分钟执行一次 |
| 32 | public void execute(){ | 32 | public void execute(){ |
| 33 | logger.info("[定时任务] 清理过期的订阅信息"); | 33 | logger.info("[定时任务] 清理过期的订阅信息"); |
| 34 | Calendar calendar = Calendar.getInstance(); | 34 | Calendar calendar = Calendar.getInstance(); |
| 35 | calendar.setTime(new Date()); | 35 | calendar.setTime(new Date()); |
| 36 | - calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1); | 36 | + calendar.set(Calendar.MINUTE, calendar.get(Calendar.MINUTE) - 5); |
| 37 | + | ||
| 37 | for (String key : okTimeSubscribes.keySet()) { | 38 | for (String key : okTimeSubscribes.keySet()) { |
| 38 | if (okTimeSubscribes.get(key).before(calendar.getTime())){ | 39 | if (okTimeSubscribes.get(key).before(calendar.getTime())){ |
| 39 | - logger.info("[定时任务] 清理过期的订阅信息: {}", key); | 40 | +// logger.info("[定时任务] 清理过期的订阅信息: {}", key); |
| 40 | okSubscribes.remove(key); | 41 | okSubscribes.remove(key); |
| 41 | okTimeSubscribes.remove(key); | 42 | okTimeSubscribes.remove(key); |
| 42 | } | 43 | } |
| 43 | } | 44 | } |
| 44 | for (String key : errorTimeSubscribes.keySet()) { | 45 | for (String key : errorTimeSubscribes.keySet()) { |
| 45 | if (errorTimeSubscribes.get(key).before(calendar.getTime())){ | 46 | if (errorTimeSubscribes.get(key).before(calendar.getTime())){ |
| 46 | - logger.info("[定时任务] 清理过期的订阅信息: {}", key); | 47 | +// logger.info("[定时任务] 清理过期的订阅信息: {}", key); |
| 47 | errorSubscribes.remove(key); | 48 | errorSubscribes.remove(key); |
| 48 | errorTimeSubscribes.remove(key); | 49 | errorTimeSubscribes.remove(key); |
| 49 | } | 50 | } |
| @@ -116,12 +117,12 @@ public class SipSubscribe { | @@ -116,12 +117,12 @@ public class SipSubscribe { | ||
| 116 | 117 | ||
| 117 | public void addErrorSubscribe(String key, SipSubscribe.Event event) { | 118 | public void addErrorSubscribe(String key, SipSubscribe.Event event) { |
| 118 | errorSubscribes.put(key, event); | 119 | errorSubscribes.put(key, event); |
| 119 | - timeSubscribes.put(key, new Date()); | 120 | + errorTimeSubscribes.put(key, new Date()); |
| 120 | } | 121 | } |
| 121 | 122 | ||
| 122 | public void addOkSubscribe(String key, SipSubscribe.Event event) { | 123 | public void addOkSubscribe(String key, SipSubscribe.Event event) { |
| 123 | okSubscribes.put(key, event); | 124 | okSubscribes.put(key, event); |
| 124 | - timeSubscribes.put(key, new Date()); | 125 | + okTimeSubscribes.put(key, new Date()); |
| 125 | } | 126 | } |
| 126 | 127 | ||
| 127 | public SipSubscribe.Event getErrorSubscribe(String key) { | 128 | public SipSubscribe.Event getErrorSubscribe(String key) { |
| @@ -130,7 +131,7 @@ public class SipSubscribe { | @@ -130,7 +131,7 @@ public class SipSubscribe { | ||
| 130 | 131 | ||
| 131 | public void removeErrorSubscribe(String key) { | 132 | public void removeErrorSubscribe(String key) { |
| 132 | errorSubscribes.remove(key); | 133 | errorSubscribes.remove(key); |
| 133 | - timeSubscribes.remove(key); | 134 | + errorTimeSubscribes.remove(key); |
| 134 | } | 135 | } |
| 135 | 136 | ||
| 136 | public SipSubscribe.Event getOkSubscribe(String key) { | 137 | public SipSubscribe.Event getOkSubscribe(String key) { |
| @@ -139,7 +140,7 @@ public class SipSubscribe { | @@ -139,7 +140,7 @@ public class SipSubscribe { | ||
| 139 | 140 | ||
| 140 | public void removeOkSubscribe(String key) { | 141 | public void removeOkSubscribe(String key) { |
| 141 | okSubscribes.remove(key); | 142 | okSubscribes.remove(key); |
| 142 | - timeSubscribes.remove(key); | 143 | + okTimeSubscribes.remove(key); |
| 143 | } | 144 | } |
| 144 | public int getErrorSubscribesSize(){ | 145 | public int getErrorSubscribesSize(){ |
| 145 | return errorSubscribes.size(); | 146 | return errorSubscribes.size(); |