Updated Branches: refs/heads/master 9b9c08113 -> 4506c5970
updating the instance notification service with correct SM URL and Port Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8344f0ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8344f0ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8344f0ab Branch: refs/heads/master Commit: 8344f0aba16f1c70018304e8aaaceac1d2e3bc2f Parents: b23434e Author: rekathiru <[email protected]> Authored: Fri Jan 10 17:40:42 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 10 17:40:42 2014 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/stratos/autoscaler/Constants.java | 2 +- .../client/cloud/controller/CloudControllerClient.java | 2 +- .../client/cloud/controller/InstanceNotificationClient.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8344f0ab/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 b0cd242..691535e 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 @@ -19,7 +19,7 @@ public class Constants { public static final int CLOUD_CONTROLLER_DEFAULT_PORT = 9444; public static final String STRATOS_MANAGER_SERVICE_SFX = "services/InstanceCleanupNotificationService"; - public static final int STRATOS_MANAGER_DEFAULT_PORT = 9444; + public static final int STRATOS_MANAGER_DEFAULT_PORT = 9445; 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"; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8344f0ab/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 57ab302..061b3be 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(Constants.STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT, 180000); + int cloudControllerClientTimeout = conf.getInt("autoscaler.cloudController.clientTimeout", 180000); stub = new CloudControllerServiceStub(epr); stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, cloudControllerClientTimeout); stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, cloudControllerClientTimeout); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8344f0ab/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/InstanceNotificationClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/InstanceNotificationClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/InstanceNotificationClient.java index bb0ed0b..4b99002 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/InstanceNotificationClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/InstanceNotificationClient.java @@ -51,10 +51,10 @@ public class InstanceNotificationClient { Constants.STRATOS_MANAGER_DEFAULT_PORT); String hostname = conf.getString(Constants.STRATOS_MANAGER_HOSTNAME_ELEMENT, "localhost"); String epr = "https://"; + hostname + ":" + port + "/" + Constants.STRATOS_MANAGER_SERVICE_SFX; - int cloudControllerClientTimeout = conf.getInt("autoscaler.cloudController.clientTimeout", 180000); + int instanceNotificationTimeOut = conf.getInt(Constants.STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT, 180000); stub = new InstanceCleanupNotificationServiceStub(epr); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, cloudControllerClientTimeout); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, cloudControllerClientTimeout); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, instanceNotificationTimeOut); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, instanceNotificationTimeOut); } catch (Exception e) { log.error("Stub init error", e); }
