Inactivity timer is now a timer that runs every thirty seconds and the last...

Inactivity timer is now a timer that runs every thirty seconds and the last time a session was active is set on the session itself.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5921 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/http/HttpBindServlet.java

@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
+import javax.servlet.ServletConfig;
 import java.io.IOException;
 import java.net.InetAddress;
 
@@ -52,6 +53,18 @@ public class HttpBindServlet extends HttpServlet {
         this.sessionManager = sessionManager;
     }
 
+
+    @Override public void init(ServletConfig servletConfig) throws ServletException {
+        super.init(servletConfig);
+        sessionManager.start();
+    }
+
+
+    @Override public void destroy() {
+        super.destroy();
+        sessionManager.stop();
+    }
+
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException

src/java/org/jivesoftware/wildfire/http/HttpSession.java

@@ -48,10 +48,12 @@ public class HttpSession extends ClientSession {
     private Set<SessionListener> listeners = new HashSet<SessionListener>();
     private boolean isClosed;
     private int inactivityTimeout;
+    private long lastActivity;
 
     public HttpSession(String serverName, InetAddress address, StreamID streamID) {
         super(serverName, null, streamID);
         conn = new HttpVirtualConnection(address);
+        this.lastActivity = System.currentTimeMillis();
     }
 
     void addConnection(HttpConnection connection, boolean isPoll) throws HttpBindException,
@@ -92,6 +94,7 @@ public class HttpSession extends ClientSession {
     }
 
     private void fireConnectionOpened(HttpConnection connection) {
+        lastActivity = System.currentTimeMillis();
         Collection<SessionListener> listeners =
                 new HashSet<SessionListener>(this.listeners);
         for(SessionListener listener : listeners) {
@@ -215,6 +218,7 @@ public class HttpSession extends ClientSession {
     }
 
     private void fireConnectionClosed(HttpConnection connection) {
+        lastActivity = System.currentTimeMillis();
         Collection<SessionListener> listeners =
                 new HashSet<SessionListener>(this.listeners);
         for(SessionListener listener : listeners) {
@@ -340,6 +344,10 @@ public class HttpSession extends ClientSession {
         return connectionQueue.size();
     }
 
+    public synchronized long getLastActivity() {
+        return lastActivity;
+    }
+
     /**
      * A virtual server connection relates to a http session which its self can relate to many
      * http connections.

src/java/org/jivesoftware/wildfire/http/HttpSessionManager.java

@@ -12,6 +12,7 @@ package org.jivesoftware.wildfire.http;
 
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
+import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.StreamID;
 import org.jivesoftware.wildfire.multiplex.MultiplexerPacketRouter;
@@ -20,6 +21,7 @@ import org.jivesoftware.wildfire.auth.UnauthorizedException;
 import org.dom4j.*;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 
@@ -57,9 +59,10 @@ public class HttpSessionManager {
      */
     private static int pollingInterval;
 
-    private InactivityTimer timer = new InactivityTimer();
     private SessionManager sessionManager;
-    private Map<String, HttpSession> sessionMap = new HashMap<String, HttpSession>();
+    private Map<String, HttpSession> sessionMap = new ConcurrentHashMap<String, HttpSession>();
+    private Timer inactivityTimer = new Timer("HttpSession Inactivity Timer");
+    private TimerTask inactivityThread = new HttpSessionReaper();
 
     static {
         // Set the default read idle timeout. If none was set then assume 30 minutes
@@ -72,6 +75,19 @@ public class HttpSessionManager {
         this.sessionManager = SessionManager.getInstance();
     }
 
+    public void start() {
+        inactivityTimer.schedule(inactivityThread, 30 * JiveConstants.SECOND,
+                30 * JiveConstants.SECOND);
+    }
+
+    public void stop() {
+        inactivityTimer.cancel();
+        for(HttpSession session : sessionMap.values()) {
+            session.close();
+        }
+        sessionMap.clear();
+    }
+
     public HttpSession getSession(String streamID) {
         return sessionMap.get(streamID);
     }
@@ -109,8 +125,6 @@ public class HttpSessionManager {
             Log.error("Error creating document", e);
             throw new HttpBindException("Internal server error", true, 500);
         }
-
-        timer.reset(session);
         return session;
     }
 
@@ -123,19 +137,14 @@ public class HttpSessionManager {
         sessionMap.put(streamID.getID(), session);
         session.addSessionCloseListener(new SessionListener() {
             public void connectionOpened(HttpSession session, HttpConnection connection) {
-                    timer.stop(session);
             }
 
             public void connectionClosed(HttpSession session, HttpConnection connection) {
-                if (session.getConnectionCount() <= 0) {
-                    timer.reset(session);
-                }
             }
 
             public void sessionClosed(HttpSession session) {
                 sessionMap.remove(session.getStreamID().getID());
                 sessionManager.removeSession(session);
-                timer.stop(session);
             }
         });
         return session;
@@ -200,38 +209,15 @@ public class HttpSessionManager {
         return connection;
     }
 
-    private class InactivityTimer extends Timer {
-        private Map<String, InactivityTimeoutTask> sessionMap
-                = new HashMap<String, InactivityTimeoutTask>();
-
-        public void stop(HttpSession session) {
-            InactivityTimeoutTask task = sessionMap.remove(session.getStreamID().getID());
-            if(task != null) {
-                task.cancel();
-            }
-        }
-
-        public void reset(HttpSession session) {
-            stop(session);
-            if(session.isClosed()) {
-                return;
-            }
-            InactivityTimeoutTask task = new InactivityTimeoutTask(session);
-            schedule(task, session.getInactivityTimeout() * 1000);
-            sessionMap.put(session.getStreamID().getID(), task);
-        }
-    }
-
-    private class InactivityTimeoutTask extends TimerTask {
-        private HttpSession session;
-
-        public InactivityTimeoutTask(HttpSession session) {
-            this.session = session;
-        }
+    private class HttpSessionReaper extends TimerTask {
 
         public void run() {
-            session.close();
-            timer.sessionMap.remove(session.getStreamID().getID());
+            for(HttpSession session : sessionMap.values()) {
+                long lastActive = (System.currentTimeMillis() - session.getLastActivity()) / 1000;
+                if(lastActive > session.getInactivityTimeout()) {
+                    session.close();
+                }
+            }
         }
     }
 }

src/java/org/jivesoftware/wildfire/spi/ConnectionManagerImpl.java

@@ -20,9 +20,7 @@ import org.jivesoftware.wildfire.http.HttpBindServlet;
 import org.jivesoftware.wildfire.container.BasicModule;
 import org.jivesoftware.wildfire.multiplex.MultiplexerPacketDeliverer;
 import org.jivesoftware.wildfire.net.*;
-import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.ServletHandler;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;