Merge pull request #30 from gneokleo/master

Don't close all the sessions in server sockets
OpenChatAlytics · Apr 13, 2016 · 2b18ba5 · 2b18ba5
2 parents bd8d4da + 6dbda26
commit 2b18ba5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/compute/src/main/java/com/chatalytics/compute/realtime/RealtimeResource.java b/compute/src/main/java/com/chatalytics/compute/realtime/RealtimeResource.java
@@ -90,20 +90,21 @@ public void publishEvent(ChatAlyticsEvent event) {
     }
 
     /**
-     * Tries to close the session
+     * Closes a session
      *
+     * @param session
+     *            The session to close
      * @param reason
-     *            Reason for closing
+     *            The reason for closing
      */
     @OnClose
-    public void close(CloseReason reason) {
-        LOG.info("Closing {} sessions", sessions.size());
-        for (Session session : sessions) {
-            try {
-                session.close();
-            } catch (IOException e) {
-                LOG.warn("Couldn't close {}", session.getId());
-            }
+    public void close(Session session, CloseReason reason) {
+        LOG.info("Closing session {}. Reason {}", session.getId(), reason);
+        try {
+            session.close();
+            sessions.remove(session);
+        } catch (IOException e) {
+            LOG.warn("Couldn't close {}", session.getId());
         }
     }
 

diff --git a/web/src/main/java/com/chatalytics/web/resources/EventsResource.java b/web/src/main/java/com/chatalytics/web/resources/EventsResource.java
@@ -64,15 +64,22 @@ public void onOpen(Session session) {
         }
     }
 
+    /**
+     * Closes a session
+     *
+     * @param session
+     *            The session to close
+     * @param reason
+     *            The reason for closing
+     */
     @OnClose
-    public void close(CloseReason reason) {
-        LOG.info("Closing {} sessions", sessions.size());
-        for (Session session : sessions) {
-            try {
-                session.close();
-            } catch (IOException e) {
-                LOG.warn("Couldn't close {}", session.getId());
-            }
+    public void close(Session session, CloseReason reason) {
+        LOG.info("Closing session {}. Reason {}", session.getId(), reason);
+        try {
+            session.close();
+            sessions.remove(session);
+        } catch (IOException e) {
+            LOG.warn("Couldn't close {}", session.getId());
         }
     }