You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/12/18 06:39:20 UTC
[1/2] git commit: Add configrable cloud controller client timeout
Updated Branches:
refs/heads/master 8b0d90ca1 -> 45815379c
Add configrable cloud controller client timeout
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e39a7ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e39a7ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e39a7ad
Branch: refs/heads/master
Commit: 5e39a7ad562ec989eaf22f6853113c0e8d2f6ae2
Parents: 676d64a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 18 11:13:05 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 18 11:13:05 2013 +0530
----------------------------------------------------------------------
.../autoscaler/client/cloud/controller/CloudControllerClient.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5e39a7ad/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 904b38d..538e4b7 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,10 @@ 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);
stub = new CloudControllerServiceStub(epr);
+ stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(cloudControllerClientTimeout);
+
} catch (Exception e) {
log.error("Stub init error", e);
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/45815379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/45815379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/45815379
Branch: refs/heads/master
Commit: 45815379ce21264dea820e8b772a49783fe653f3
Parents: 5e39a7a 8b0d90c
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 18 11:13:42 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 18 11:13:42 2013 +0530
----------------------------------------------------------------------
.../stratos/adc/mgt/payload/BasicPayloadData.java | 4 ++--
.../receiver/StratosManagerTopologyReceiver.java | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------