You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/12 10:04:52 UTC
git commit: Updated cloud controller and autoscaler service urls in
stratos manager
Updated Branches:
refs/heads/master 61d41066d -> cf538d054
Updated cloud controller and autoscaler service urls in stratos manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cf538d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cf538d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cf538d05
Branch: refs/heads/master
Commit: cf538d0547e10547f678280c0dbaca5fee1a963f
Parents: 61d4106
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 14:27:30 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 14:27:30 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/adc/mgt/client/AutoscalerServiceClient.java | 6 +++---
.../apache/stratos/adc/mgt/client/CartridgeAgentClient.java | 4 +++-
.../stratos/adc/mgt/client/CloudControllerServiceClient.java | 2 +-
.../org/apache/stratos/adc/mgt/utils/CartridgeConstants.java | 3 ++-
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cf538d05/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
index a0104c5..0d5e930 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.adc.mgt.exception.ADCException;
import org.apache.stratos.adc.mgt.internal.DataHolder;
+import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceNonExistingLBExceptionException;
@@ -39,7 +40,6 @@ public class AutoscalerServiceClient {
private static final Log log = LogFactory.getLog(AutoscalerServiceClient.class);
private static volatile AutoscalerServiceClient serviceClient;
- private static final String AUTOSCALER_SERVICE_URL = "autoscaler.service.url";
public AutoscalerServiceClient(String epr) throws AxisFault {
@@ -49,7 +49,7 @@ public class AutoscalerServiceClient {
stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000);
} catch (AxisFault axisFault) {
- String msg = "Failed to initiate AutoscalerService client. " + axisFault.getMessage();
+ String msg = "Failed to initiate autoscaler service client. " + axisFault.getMessage();
log.error(msg, axisFault);
throw new AxisFault(msg, axisFault);
}
@@ -59,7 +59,7 @@ public class AutoscalerServiceClient {
if (serviceClient == null) {
synchronized (AutoscalerServiceClient.class) {
if (serviceClient == null) {
- serviceClient = new AutoscalerServiceClient(System.getProperty(AUTOSCALER_SERVICE_URL));
+ serviceClient = new AutoscalerServiceClient(System.getProperty(CartridgeConstants.AUTOSCALER_SERVICE_URL));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cf538d05/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CartridgeAgentClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CartridgeAgentClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CartridgeAgentClient.java
index cd8c4e6..91a1150 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CartridgeAgentClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CartridgeAgentClient.java
@@ -36,7 +36,9 @@ public class CartridgeAgentClient {
}
public void unregister(String domain, String subDomain, String hostName) throws Exception {
- log.info(" ** Unregistering -- ");
+ if(log.isInfoEnabled()) {
+ log.info("Unregistering cartridge agent client...");
+ }
stub.unregister(domain, subDomain, hostName);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cf538d05/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
index 73d5c36..229026d 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
@@ -65,7 +65,7 @@ public class CloudControllerServiceClient {
synchronized (CloudControllerServiceClient.class) {
if (serviceClient == null) {
serviceClient = new CloudControllerServiceClient(
- System.getProperty(CartridgeConstants.AUTOSCALER_SERVICE_URL));
+ System.getProperty(CartridgeConstants.CLOUD_CONTROLLER_SERVICE_URL));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cf538d05/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
index bb2f102..4bb6400 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
@@ -21,7 +21,8 @@ package org.apache.stratos.adc.mgt.utils;
public class CartridgeConstants {
public static final String SC_IP = "sc.ip";
- public static final String AUTOSCALER_SERVICE_URL = "autoscalerService.url";
+ public static final String AUTOSCALER_SERVICE_URL = "autoscaler.service.url";
+ public static final String CLOUD_CONTROLLER_SERVICE_URL = "cloud.controller.service.url";
public static final String ALIAS_NAMESPACE ="http://org.wso2.securevault/configuration";
public static final String ALIAS_LOCALPART ="secretAlias";
public static final String ALIAS_PREFIX ="svns";