Merge pull request #102 from mendix/features/idle-connection-monitor

Added a idle connection monitor that regularly closes idle connections

javasource/restservices/actions/startIdleConnectionMonitor.java

@@ -0,0 +1,51 @@
+// This file was generated by Mendix Modeler.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package restservices.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+import restservices.consume.RestConsumer;
+
+/**
+ * Regularly checks for connections connections that have been idle for at least the given amount of time, and closes them.
+ */
+public class startIdleConnectionMonitor extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.Long interval;
+	private java.lang.Long maxIdleTime;
+
+	public startIdleConnectionMonitor(IContext context, java.lang.Long interval, java.lang.Long maxIdleTime)
+	{
+		super(context);
+		this.interval = interval;
+		this.maxIdleTime = maxIdleTime;
+	}
+
+	@Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return RestConsumer.startIdleConnectionMonitor(interval, maxIdleTime);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 */
+	@Override
+	public java.lang.String toString()
+	{
+		return "startIdleConnectionMonitor";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}

javasource/restservices/consume/IdleConnectionMonitorThread.java

@@ -0,0 +1,39 @@
+package restservices.consume;
+
+import org.apache.commons.httpclient.HttpConnectionManager;
+
+public class IdleConnectionMonitorThread extends Thread {
+
+	private final HttpConnectionManager connMgr;
+	private long intervalMillis;
+	private long maxIdleTimeMillis;
+	private volatile boolean shutdown;
+
+	public IdleConnectionMonitorThread(HttpConnectionManager connMgr, long intervalMillis, long maxIdleTimeMillis) {
+		super();
+		this.connMgr = connMgr;
+		this.intervalMillis = intervalMillis;
+		this.maxIdleTimeMillis = maxIdleTimeMillis;
+	}
+
+	@Override
+	public void run() {
+		try {
+			while (!shutdown) {
+				synchronized (this) {
+					wait(intervalMillis);
+					connMgr.closeIdleConnections(maxIdleTimeMillis);
+				}
+			}
+		} catch (InterruptedException ex) {
+			// terminate
+		}
+	}
+
+	public void shutdown() {
+		shutdown = true;
+		synchronized (this) {
+			notifyAll();
+		}
+	}
+}

javasource/restservices/consume/RestConsumer.java

@@ -71,9 +71,10 @@
 public class RestConsumer {
 	private static ThreadLocal<HttpResponseData> lastConsumeError = new ThreadLocal<HttpResponseData>();
 
+    private static IdleConnectionMonitorThread idleConnectionMonitorThread = null;
 	private static MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
     static HttpClient client = new HttpClient(connectionManager);
-
+    
 	static {
 		connectionManager.getParams().setMaxConnectionsPerHost(HostConfiguration.ANY_HOST_CONFIGURATION, 10);
 	}
@@ -740,4 +741,15 @@ public static RequestResult getLastConsumeError(IContext context) {
 		lastConsumeError.set(null);
 		return res.asRequestResult(context);
 	}
+
+	public static boolean startIdleConnectionMonitor(long interval, long maxIdleTime)
+	{
+		if (idleConnectionMonitorThread != null)
+			return false;
+
+		idleConnectionMonitorThread = new IdleConnectionMonitorThread(connectionManager, interval, maxIdleTime);
+		idleConnectionMonitorThread.start();
+
+		return true;
+	}
 }

javasource/system/UserActionsRegistrar.java

@@ -148,6 +148,7 @@ public void registerActions(IActionRegistrator registrator)
     registrator.registerUserAction(restservices.actions.setResponseHeader.class);
     registrator.registerUserAction(restservices.actions.setResponseStatus.class);
     registrator.registerUserAction(restservices.actions.setRestBasePath.class);
+    registrator.registerUserAction(restservices.actions.startIdleConnectionMonitor.class);
     registrator.registerUserAction(restservices.actions.StartMicroflowServiceJava.class);
     registrator.registerUserAction(restservices.actions.StartPublishesServicesJava.class);
     registrator.registerUserAction(restservices.actions.throwRestServiceException.class);