Repository: incubator-stratos Updated Branches: refs/heads/master 04dc338c3 -> b0d393991
fixing STRATOS-542 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b0d39399 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b0d39399 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b0d39399 Branch: refs/heads/master Commit: b0d393991bd2a8cc57e0e2011c836e8ab9a34d4f Parents: 04dc338 Author: rekathiru <[email protected]> Authored: Sun Mar 23 21:42:33 2014 -0400 Committer: rekathiru <[email protected]> Committed: Sun Mar 23 21:42:33 2014 -0400 ---------------------------------------------------------------------- .../org/apache/stratos/cartridge/agent/CartridgeAgent.java | 3 ++- .../cartridge/agent/config/CartridgeAgentConfiguration.java | 6 +++++- .../agent/statistics/publisher/HealthStatisticsReader.java | 6 +++--- .../stratos/cartridge/agent/util/CartridgeAgentConstants.java | 2 ++ .../modules/distribution/src/main/bin/stratos.sh | 1 + 5 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0d39399/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index c738235..68031a7 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -56,7 +56,8 @@ public class CartridgeAgent implements Runnable { ExtensionUtils.executeStartServersExtension(); // Wait for all ports to be active - CartridgeAgentUtils.waitUntilPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts()); + CartridgeAgentUtils.waitUntilPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(), + CartridgeAgentConfiguration.getInstance().getPorts()); // Check repo url String repoUrl = CartridgeAgentConfiguration.getInstance().getRepoUrl(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0d39399/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java index 1a893cb..4b1db26 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java @@ -35,6 +35,7 @@ public class CartridgeAgentConfiguration { private boolean isMultitenant; private String persistenceMappings; private final boolean isCommitsEnabled; + private final String listenAddress; private CartridgeAgentConfiguration() { parameters = loadParametersFile(); @@ -53,6 +54,7 @@ public class CartridgeAgentConfiguration { isMultitenant = readMultitenant(CartridgeAgentConstants.MULTITENANT); persistenceMappings = readPersisenceMapping(); isCommitsEnabled = readCommitsEnabled(CartridgeAgentConstants.COMMIT_ENABLED); + listenAddress = System.getProperty(CartridgeAgentConstants.LISTEN_ADDRESS); } catch (ParameterNotFoundException e) { throw new RuntimeException(e); @@ -247,6 +249,8 @@ public class CartridgeAgentConfiguration { return isCommitsEnabled; } - + public String getListenAddress() { + return listenAddress; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0d39399/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java index 46b0115..b986191 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java @@ -19,6 +19,7 @@ package org.apache.stratos.cartridge.agent.statistics.publisher; +import com.sun.management.OperatingSystemMXBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration; @@ -26,8 +27,6 @@ import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils; import java.lang.management.ManagementFactory; -import com.sun.management.OperatingSystemMXBean; - /** * Health statistics reader. */ @@ -67,6 +66,7 @@ public class HealthStatisticsReader { } public static boolean allPortsActive() { - return CartridgeAgentUtils.checkPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts()); + return CartridgeAgentUtils.checkPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(), + CartridgeAgentConfiguration.getInstance().getPorts()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0d39399/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java index ba8c99b..8434d6d 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java @@ -51,4 +51,6 @@ public class CartridgeAgentConstants implements Serializable{ public static final String ENABLE_ARTIFACT_UPDATE = "enable.artifact.update"; public static final String ARTIFACT_UPDATE_INTERVAL = "artifact.update.interval"; public static final String COMMIT_ENABLED = "COMMIT_ENABLED"; + + public static final String LISTEN_ADDRESS = "listen.address"; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0d39399/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh index 7cb30f0..922fd8f 100644 --- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh +++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh @@ -26,6 +26,7 @@ lib_path=${script_path}/../lib/ class_path=`echo ${lib_path}/*.jar | tr ' ' ':'` properties="-Dmb.ip=MB-IP -Dmb.port=MB-PORT + -Dlisten.address=localhost -Dthrift.receiver.ip=CEP-IP -Dthrift.receiver.port=CEP-PORT -Djndi.properties.template.file.path=${script_path}/../conf/templates/jndi.properties.template
