From ed2e863fe4acfdb5015b5514c3219bef8c215ff3 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 17 May 2018 10:54:50 +0300 Subject: xmpp: fix cleanup of idle connections --- juick-server/build.gradle | 2 +- juick-server/src/main/java/com/juick/server/XMPPServer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'juick-server') diff --git a/juick-server/build.gradle b/juick-server/build.gradle index c9d69192..7d177005 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -17,7 +17,7 @@ dependencies { compile 'org.imgscalr:imgscalr-lib:4.2' compile 'org.twitter4j:twitter4j-core:4.0.6' - compile ('com.github.juick:com.juick.xmpp:658f8cf751') { + compile ('com.github.juick:com.juick.xmpp:9b7d8e07a9') { exclude group: 'xmlpull' } compile 'xpp3:xpp3:1.1.4c' diff --git a/juick-server/src/main/java/com/juick/server/XMPPServer.java b/juick-server/src/main/java/com/juick/server/XMPPServer.java index bf8ed228..1ae2bbdf 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPServer.java +++ b/juick-server/src/main/java/com/juick/server/XMPPServer.java @@ -392,14 +392,14 @@ public class XMPPServer implements ConnectionListener, AutoCloseable { @Scheduled(fixedDelay = 10000) public void cleanUp() { Instant now = Instant.now(); - outConnections.keySet().stream().filter(c -> Duration.between(now, c.getUpdated()).toMinutes() > TIMEOUT_MINUTES) + outConnections.keySet().stream().filter(c -> Duration.between(c.getUpdated(), now).toMinutes() > TIMEOUT_MINUTES) .forEach(c -> { logger.info("closing idle outgoing connection to {}", c.to); c.logoff(); outConnections.remove(c); }); - inConnections.stream().filter(c -> Duration.between(now, c.updated).toMinutes() > TIMEOUT_MINUTES) + inConnections.stream().filter(c -> Duration.between(c.updated, now).toMinutes() > TIMEOUT_MINUTES) .forEach(c -> { logger.info("closing idle incoming connection from {}", c.from); c.closeConnection(); -- cgit v1.2.3