You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/06/11 17:35:06 UTC
git commit: AIRAVATA-1283 - Added support for hostname in all servers.
Repository: airavata
Updated Branches:
refs/heads/master a728ab500 -> 18fb76e31
AIRAVATA-1283 - Added support for hostname in all servers.
Signed-off-by: lahiru <la...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/18fb76e3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/18fb76e3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/18fb76e3
Branch: refs/heads/master
Commit: 18fb76e31d0650ac5b950b7bcfcb8dafb8c227fa
Parents: a728ab5
Author: Gagan <ga...@gmail.com>
Authored: Sat Jun 7 15:00:04 2014 +0530
Committer: lahiru <la...@apache.org>
Committed: Wed Jun 11 11:15:32 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 16 ++++++++++++++--
.../api/server/ApplicationCatalogServer.java | 14 +++++++++++++-
.../api/server/handler/AiravataServerHandler.java | 10 +++++-----
.../apache/airavata/api/server/util/Constants.java | 7 +++++--
.../src/main/resources/airavata-server.properties | 7 +++++--
modules/orchestrator/NULL | 1 +
.../orchestrator/server/OrchestratorServer.java | 14 +++++++++++++-
.../airavata/orchestrator/util/Constants.java | 1 +
8 files changed, 57 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/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 dfe050d..44484b9 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
@@ -21,6 +21,8 @@
package org.apache.airavata.api.server;
+import java.net.InetSocketAddress;
+
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.server.handler.AiravataServerHandler;
import org.apache.airavata.api.server.util.Constants;
@@ -57,8 +59,18 @@ public class AiravataAPIServer implements IServer{
try {
AiravataUtils.setExecutionAsServer();
RegistryInitUtil.initializeDB();
- final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.THRIFT_SERVER_PORT,"8930"));
- TServerTransport serverTransport = new TServerSocket(serverPort);
+ final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_PORT,"8930"));
+ final String serverHost = ServerSettings.getSetting(Constants.API_SERVER_HOST, null);
+
+ TServerTransport serverTransport;
+
+ if(serverHost == null){
+ serverTransport = new TServerSocket(serverPort);
+ }else{
+ InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
+ serverTransport = new TServerSocket(inetSocketAddress);
+ }
+
TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_MIN_THREADS, "30"));
server = new TThreadPoolServer(options.processor(mockAiravataServer));
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
index c470af0..905fb3a 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
@@ -21,6 +21,8 @@
package org.apache.airavata.api.server;
+import java.net.InetSocketAddress;
+
import org.apache.airavata.api.appcatalog.ApplicationCatalogAPI;
import org.apache.airavata.api.server.handler.ApplicationCatalogHandler;
import org.apache.airavata.api.server.util.Constants;
@@ -55,7 +57,17 @@ public class ApplicationCatalogServer implements IServer{
try {
AiravataUtils.setExecutionAsServer();
final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.APP_CATALOG_SERVER_PORT,"8931"));
- TServerTransport serverTransport = new TServerSocket(serverPort);
+ final String serverHost = ServerSettings.getSetting(Constants.APP_CATALOG_SERVER_HOST, null);
+
+ TServerTransport serverTransport;
+
+ if(serverHost == null){
+ serverTransport = new TServerSocket(serverPort);
+ }else{
+ InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
+ serverTransport = new TServerSocket(inetSocketAddress);
+ }
+
server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(appCatalogServerHandler));
new Thread() {
public void run() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 4360c8a..be35568 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -23,6 +23,7 @@ package org.apache.airavata.api.server.handler;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.airavataAPIConstants;
+import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.model.error.*;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.orchestrator.client.OrchestratorClientFactory;
@@ -47,10 +48,7 @@ public class AiravataServerHandler implements Airavata.Iface {
private Registry registry;
private OrchestratorService.Client orchestratorClient;
private static final Logger logger = LoggerFactory.getLogger(AiravataServerHandler.class);
- //FIXME: these go in a configuration file or a "constants" class.
- public static final String ORCHESTRATOR_SERVER_HOST = "localhost";
- //FIXME: these go in a configuration file or a "constants" class.
- public static final int ORCHESTRATOR_SERVER_PORT = 8940;
+
/**
* Query Airavata to fetch the API version
@@ -907,7 +905,9 @@ public class AiravataServerHandler implements Airavata.Iface {
}
private OrchestratorService.Client getOrchestratorClient() {
- return orchestratorClient = OrchestratorClientFactory.createOrchestratorClient(ORCHESTRATOR_SERVER_HOST, ORCHESTRATOR_SERVER_PORT);
+ final int serverPort = Integer.parseInt(ServerSettings.getSetting(org.apache.airavata.api.server.util.Constants.ORCHESTRATOR_SERVER_PORT,"8940"));
+ final String serverHost = ServerSettings.getSetting(org.apache.airavata.api.server.util.Constants.ORCHESTRATOR_SERVER_HOST, null);
+ return orchestratorClient = OrchestratorClientFactory.createOrchestratorClient(serverHost, serverPort);
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
index cfd7d82..eb6a119 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
@@ -22,8 +22,11 @@
package org.apache.airavata.api.server.util;
public class Constants {
- public static final String THRIFT_SERVER_PORT = "apiserver.server.port";
+ public static final String API_SERVER_PORT = "apiserver.server.port";
+ public static final String API_SERVER_HOST = "apiserver.server.host";
public static final String APP_CATALOG_SERVER_PORT = "app.catalog.server.port";
+ public static final String APP_CATALOG_SERVER_HOST = "app.catalog.server.host";
public static final String API_SERVER_MIN_THREADS = "apiserver.server.min.threads";
-
+ public static final String ORCHESTRATOR_SERVER_HOST = "orchestrator.server.host";
+ public static final String ORCHESTRATOR_SERVER_PORT = "orchestrator.server.port";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 98bdcec..b99c6cb 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -316,8 +316,11 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-
+apiserver.server.host=localhost
apiserver.server.port=8930
-app.catalog.server.port=8931
apiserver.server.min.threads=30
+app.catalog.server.host=localhost
+app.catalog.server.port=8931
+orchestrator.server.host=localhost
+orchestrator.server.port=8940
orchestrator.server.min.threads=30
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/modules/orchestrator/NULL
----------------------------------------------------------------------
diff --git a/modules/orchestrator/NULL b/modules/orchestrator/NULL
new file mode 100644
index 0000000..6c7ca83
--- /dev/null
+++ b/modules/orchestrator/NULL
@@ -0,0 +1 @@
+Device 0 (VID=18d1 and PID=4ee1) is a Google Inc (for LG Electronics/Samsung) Nexus 4/10 (MTP).
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/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 7580bfa..df24a9e 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
@@ -21,6 +21,8 @@
package org.apache.airavata.orchestrator.server;
+import java.net.InetSocketAddress;
+
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
@@ -51,7 +53,17 @@ public class OrchestratorServer implements IServer{
throws Exception {
try {
final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_PORT,"8940"));
- TServerTransport serverTransport = new TServerSocket(serverPort);
+ final String serverHost = ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_HOST, null);
+
+ TServerTransport serverTransport;
+
+ if(serverHost == null){
+ serverTransport = new TServerSocket(serverPort);
+ }else{
+ InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
+ serverTransport = new TServerSocket(inetSocketAddress);
+ }
+
//server = new TSimpleServer(
// new TServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor));
TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
http://git-wip-us.apache.org/repos/asf/airavata/blob/18fb76e3/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
index 78177d0..f9833e9 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
@@ -23,6 +23,7 @@ package org.apache.airavata.orchestrator.util;
public class Constants {
public static final String ORCHESTRATOT_SERVER_PORT = "orchestrator.server.port";
+ public static final String ORCHESTRATOT_SERVER_HOST = "orchestrator.server.host";
public static final String ORCHESTRATOT_SERVER_MIN_THREADS = "orchestrator.server.min.threads";
}