Repository: airavata Updated Branches: refs/heads/master cb6b7a831 -> 56e65c100
making threadpool server as default value Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/199004da Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/199004da Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/199004da Branch: refs/heads/master Commit: 199004da77ad25eb27fe1f0475283feb95848cbb Parents: bb988d3 Author: lahiru <[email protected]> Authored: Wed Mar 12 13:01:30 2014 -0400 Committer: lahiru <[email protected]> Committed: Wed Mar 12 13:01:30 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/api/server/AiravataAPIServer.java | 8 +++++--- .../airavata/orchestrator/server/OrchestratorServer.java | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/199004da/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java index 1531086..2e2d5b1 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java @@ -32,6 +32,7 @@ import org.apache.airavata.common.utils.IServer; import org.apache.airavata.common.utils.ServerSettings; import org.apache.thrift.server.TServer; import org.apache.thrift.server.TSimpleServer; +import org.apache.thrift.server.TThreadPoolServer; import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; import org.apache.thrift.transport.TTransportException; @@ -47,7 +48,7 @@ public class AiravataAPIServer implements IServer{ //FIXME: Read the port from airavata-server.config file private ServerStatus status; - private TSimpleServer server; + private TServer server; public AiravataAPIServer() { setStatus(ServerStatus.STOPPED); @@ -59,8 +60,9 @@ public class AiravataAPIServer implements IServer{ RegistryInitUtil.initializeDB(); final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.THRIFT_SERVER_PORT,"8930")); TServerTransport serverTransport = new TServerSocket(serverPort); - server = new TSimpleServer( - new TServer.Args(serverTransport).processor(mockAiravataServer)); + //server = new TSimpleServer( + // new TServer.Args(serverTransport).processor(mockAiravataServer)); + server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(mockAiravataServer)); new Thread() { public void run() { server.serve(); http://git-wip-us.apache.org/repos/asf/airavata/blob/199004da/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java index 1f9a15d..115ea3f 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java @@ -29,6 +29,7 @@ import org.apache.airavata.orchestrator.util.Constants; import org.apache.thrift.server.TServer; import org.apache.thrift.server.TServerEventHandler; import org.apache.thrift.server.TSimpleServer; +import org.apache.thrift.server.TThreadPoolServer; import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; import org.apache.thrift.transport.TTransportException; @@ -43,7 +44,7 @@ public class OrchestratorServer implements IServer{ private ServerStatus status; - private TSimpleServer server; + private TServer server; public OrchestratorServer() { setStatus(ServerStatus.STOPPED); @@ -54,8 +55,10 @@ public class OrchestratorServer implements IServer{ try { final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_PORT,"8940")); TServerTransport serverTransport = new TServerSocket(serverPort); - server = new TSimpleServer( - new TServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor)); + //server = new TSimpleServer( + // new TServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor)); + server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor)); + new Thread() { public void run() { server.serve();
