You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/01/10 12:32:10 UTC
git commit: adding SM timeout period to AS
Updated Branches:
refs/heads/master 4789d81de -> b23434ee6
adding SM timeout period to AS
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b23434ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b23434ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b23434ee
Branch: refs/heads/master
Commit: b23434ee6a8af0629efadd137acfaec7532841b0
Parents: 4789d81
Author: rekathiru <rt...@gmail.com>
Authored: Fri Jan 10 17:02:25 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Jan 10 17:02:25 2014 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/stratos/autoscaler/Constants.java | 1 +
.../autoscaler/client/cloud/controller/CloudControllerClient.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b23434ee/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java
index 56d2e2b..b0cd242 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java
@@ -22,6 +22,7 @@ public class Constants {
public static final int STRATOS_MANAGER_DEFAULT_PORT = 9444;
public static final String STRATOS_MANAGER_HOSTNAME_ELEMENT = "autoscaler.stratosManager.hostname";
public static final String STRATOS_MANAGER_DEFAULT_PORT_ELEMENT = "autoscaler.stratosManager.port";
+ public static final String STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT= "autoscaler.stratosManager.clientTimeout";
// partition properties
public static final String REGION_PROPERTY = "region";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b23434ee/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 061b3be..57ab302 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -62,7 +62,7 @@ public class CloudControllerClient {
int port = conf.getInt("autoscaler.cloudController.port", Constants.CLOUD_CONTROLLER_DEFAULT_PORT);
String hostname = conf.getString("autoscaler.cloudController.hostname", "localhost");
String epr = "https://" + hostname + ":" + port + "/" + Constants.CLOUD_CONTROLLER_SERVICE_SFX ;
- int cloudControllerClientTimeout = conf.getInt("autoscaler.cloudController.clientTimeout", 180000);
+ int cloudControllerClientTimeout = conf.getInt(Constants.STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT, 180000);
stub = new CloudControllerServiceStub(epr);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, cloudControllerClientTimeout);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, cloudControllerClientTimeout);