update with the carbon configuration path Signed-off-by: Manula Thantriwatte <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff73b130 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff73b130 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff73b130 Branch: refs/heads/master Commit: ff73b130fe2b7d69f098ebee9081e9036380f32d Parents: 68ab6e8 Author: gayan <[email protected]> Authored: Thu Dec 4 14:32:42 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 4 13:48:39 2014 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/stratos/autoscaler/Constants.java | 4 ++-- .../stratos/autoscaler/internal/AutoscalerServerComponent.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ff73b130/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 fbcea86..7ca6282 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 @@ -41,10 +41,10 @@ public class Constants { public static final String AUTOSCALER_CONFIG_FILE_NAME = "autoscaler.xml"; public static final String CLOUD_CONTROLLER_SERVICE_SFX = "services/CloudControllerService"; - public static final int CLOUD_CONTROLLER_DEFAULT_PORT = 9443; + 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 = 9443; + 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/stratos/blob/ff73b130/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java index 91d52d3..5fc6f89 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java @@ -44,10 +44,13 @@ import org.osgi.service.component.ComponentContext; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.registry.api.RegistryException; import org.wso2.carbon.registry.core.service.RegistryService; +import org.wso2.carbon.utils.CarbonUtils; +import java.io.File; import java.util.Iterator; import java.util.List; import java.util.concurrent.ExecutorService; +import java.util.logging.FileHandler; /** * @scr.component name=org.apache.stratos.autoscaler.internal.AutoscalerServerComponent" @@ -67,7 +70,7 @@ public class AutoscalerServerComponent { private static final String THREAD_IDENTIFIER_KEY = "threadPool.autoscaler.identifier"; private static final String DEFAULT_IDENTIFIER = "Auto-Scaler"; private static final String THREAD_POOL_SIZE_KEY = "threadPool.autoscaler.threadPoolSize"; - private static final String COMPONENTS_CONFIG = "stratos-config"; + private static final String COMPONENTS_CONFIG = CarbonUtils.getCarbonConfigDirPath()+ File.separator+"stratos-config.xml"; private static final int THREAD_POOL_SIZE = 10; private static final Log log = LogFactory.getLog(AutoscalerServerComponent.class);
