Fix for Issue 4 - Allow programmatic shutdown of EbeanServer

This commit is contained in:
Robin Bygrave committed 2013-04-26 23:21:25 +12:00
1 parent 384931d92e
commit bcce1a7148
31 files changed
+1397 -2073

No files matched your search

@@ -6,11 +6,11 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import com.avaje.ebeaninternal.server.lib.thread.ThreadPool;
import com.avaje.ebeaninternal.server.lib.thread.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.avaje.ebeaninternal.server.lib.thread.ThreadPool;
/**
* Serverside multithreaded socket listener. Accepts connections and dispatches
* them to an appropriate handler.
@@ -70,7 +70,7 @@ class SocketClusterListener implements Runnable {
*/
public SocketClusterListener(SocketClusterBroadcast owner, int port) {
this.owner = owner;
this.threadPool = ThreadPoolManager.getThreadPool("EbeanClusterMember");
this.threadPool = ThreadPool.createThreadPool("EbeanCluster");
this.port = port;
try {
@@ -118,8 +118,10 @@ class SocketClusterListener implements Runnable {
listenerThread.interrupt();
serverListenSocket.close();
} catch (IOException e) {
logger.error(null, e);
logger.error("Error shutting down listener", e);
}
threadPool.shutdown();
}
/**