From 2920e943b68ca66a81f8ddac43dd6eed9d9a42b6 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 21 Mar 2018 16:39:31 +0300 Subject: xmpp: merge cleanup component --- .../src/main/java/com/juick/server/XMPPServer.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'juick-server/src/main/java/com/juick/server/XMPPServer.java') 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 a0c3ac92..53ad61a6 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPServer.java +++ b/juick-server/src/main/java/com/juick/server/XMPPServer.java @@ -24,6 +24,7 @@ import com.juick.xmpp.extensions.StreamError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.xmlpull.v1.XmlPullParserException; import rocks.xmpp.addr.Jid; @@ -43,6 +44,7 @@ import java.net.*; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.SecureRandom; +import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.List; @@ -61,6 +63,8 @@ import java.util.concurrent.atomic.AtomicBoolean; public class XMPPServer implements ConnectionListener, AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(XMPPServer.class); + private static final int TIMEOUT_MINUTES = 15; + @Inject public ExecutorService service; @Value("${hostname:localhost}") @@ -407,6 +411,23 @@ public class XMPPServer implements ConnectionListener, AutoCloseable { public Jid getJid() { return jid; } + @Scheduled(fixedDelay = 10000) + public void cleanUp() { + Instant now = Instant.now(); + outConnections.keySet().stream().filter(c -> Duration.between(now, c.getUpdated()).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) + .forEach(c -> { + logger.info("closing idle incoming connection from {}", c.from); + c.closeConnection(); + inConnections.remove(c); + }); + } @PreDestroy public void preDestroy() { closeFlag.set(true); -- cgit v1.2.3