Repository: stratos Updated Branches: refs/heads/master 08239dcb1 -> 44fa137cb
Updating error/info messages in cloud controller and rest api Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/44fa137c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/44fa137c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/44fa137c Branch: refs/heads/master Commit: 44fa137cb144176a9532f49b7c4f26113abce590 Parents: 08239dc Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 19 11:12:54 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 19 11:12:54 2014 +0530 ---------------------------------------------------------------------- .../services/impl/CloudControllerServiceImpl.java | 16 ++++++++-------- .../rest/endpoint/api/StratosApiV40Utils.java | 12 ++++++------ .../stratos/rest/endpoint/api/StratosApiV41.java | 4 ++-- .../rest/endpoint/api/StratosApiV41Utils.java | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa137c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index c1e7560..d6b505f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -189,7 +189,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { return; } } - String msg = "Cartridge [type] " + cartridgeType + " is not a deployed Cartridge type."; + String msg = "Cartridge not found: [cartridge-type] " + cartridgeType; log.error(msg); throw new InvalidCartridgeTypeException(msg); } @@ -265,7 +265,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } - String msg = "ServiceGroup " + name + " is not a deployed Service Group definition"; + String msg = "Service group not found: [group-name] " + name; log.error(msg); throw new InvalidServiceGroupException(msg); @@ -284,7 +284,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { if (log.isDebugEnabled()) { log.debug("getServiceGroupDefinition: no entry found for service group " + name); } - String msg = "ServiceGroup " + name + " is not a deployed Service Group definition"; + String msg = "Service group not found: [group-name] " + name; throw new InvalidServiceGroupException(msg); } @@ -294,7 +294,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { public String[] getServiceGroupSubGroups(String name) throws InvalidServiceGroupException { ServiceGroup serviceGroup = this.getServiceGroup(name); if (serviceGroup == null) { - throw new InvalidServiceGroupException("Invalid ServiceGroup " + serviceGroup); + throw new InvalidServiceGroupException("Invalid service group: [group-name] " + serviceGroup); } return serviceGroup.getSubGroups(); @@ -306,7 +306,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { public String[] getServiceGroupCartridges(String name) throws InvalidServiceGroupException { ServiceGroup serviceGroup = this.getServiceGroup(name); if (serviceGroup == null) { - throw new InvalidServiceGroupException("Invalid ServiceGroup " + serviceGroup); + throw new InvalidServiceGroupException("Invalid service group: [group-name] " + serviceGroup); } String[] cs = serviceGroup.getCartridges(); return cs; @@ -316,7 +316,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { public Dependencies getServiceGroupDependencies(String name) throws InvalidServiceGroupException { ServiceGroup serviceGroup = this.getServiceGroup(name); if (serviceGroup == null) { - throw new InvalidServiceGroupException("Invalid ServiceGroup " + serviceGroup); + throw new InvalidServiceGroupException("Invalid service group: [group-name] " + serviceGroup); } return serviceGroup.getDependencies(); } @@ -1665,7 +1665,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { CloudControllerContext.getInstance().persist(); if (log.isInfoEnabled()) { - log.info(String.format("Kubernetes group deployed successfully: [id] %s, [description] %s", + log.info(String.format("Kubernetes group added successfully: [id] %s, [description] %s", kubernetesGroup.getGroupId(), kubernetesGroup.getDescription())); } return true; @@ -1717,7 +1717,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { CloudControllerContext.getInstance().persist(); if (log.isInfoEnabled()) { - log.info(String.format("Kubernetes host deployed successfully: [id] %s", kubernetesGroupStored.getGroupId())); + log.info(String.format("Kubernetes host added successfully: [id] %s", kubernetesGroupStored.getGroupId())); } return true; http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa137c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index 509029a..2eb2444 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -100,8 +100,7 @@ public class StratosApiV40Utils { // call CC try { - cloudControllerServiceClient - .deployCartridgeDefinition(cartridgeConfig); + cloudControllerServiceClient.deployCartridgeDefinition(cartridgeConfig); } catch (RemoteException e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e); @@ -114,13 +113,14 @@ public class StratosApiV40Utils { log.error(message, e); throw new RestAPIException(message, e); } - - log.info("Successfully deployed Cartridge [type] "+ cartridgeDefinitionBean.getType()); - } StratosApiResponse stratosApiResponse = new StratosApiResponse(); - stratosApiResponse.setMessage("Successfully deployed cartridge definition with type " + cartridgeDefinitionBean.getType()); + String message = "Successfully added cartridge definition: [cartridge-type] " + cartridgeDefinitionBean.getType(); + stratosApiResponse.setMessage(message); + if(log.isInfoEnabled()) { + log.info(message); + } return stratosApiResponse; } http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa137c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index db25905..1201792 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -528,10 +528,10 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/autoscalingPolicy") - public Response createAutoscalingPolicyDefintion(AutoscalePolicy autoscalePolicy) + public Response addAutoscalingPolicy(AutoscalePolicy autoscalePolicy) throws RestAPIException { - StratosApiV41Utils.createAutoscalingPolicy(autoscalePolicy); + StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy); URI url = uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build(); return Response.created(url).build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa137c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 02ae223..7822db9 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -93,7 +93,7 @@ public class StratosApiV41Utils { public static void createCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt, String userName, String tenantDomain) throws RestAPIException { - log.info("Starting to deploy a cartridge: [type] " + cartridgeDefinitionBean.getType()); + log.info("Starting to add cartridge: [cartridge-type] " + cartridgeDefinitionBean.getType()); CartridgeConfig cartridgeConfig = ObjectConverter.convertCartridgeDefinitionBeanToStubCartridgeConfig(cartridgeDefinitionBean); if (cartridgeConfig == null) { @@ -107,7 +107,7 @@ public class StratosApiV41Utils { } catch (ADCException e) { throw new RestAPIException(e); } - log.info("Successfully deployed cartridge: [type] " + cartridgeDefinitionBean.getType()); + log.info("Successfully added cartridge: [cartridge-type] " + cartridgeDefinitionBean.getType()); } public static void deleteCartridgeDefinition(String cartridgeType) throws RestAPIException { @@ -521,7 +521,7 @@ public class StratosApiV41Utils { // Util methods for Autoscaling policies - public static void createAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException { + public static void addAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException { log.info(String.format("Deploying autoscaling policy: [id] %s", autoscalePolicyBean.getId()));
