Fix logs formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/87b4471e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/87b4471e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/87b4471e Branch: refs/heads/stratos-4.1.x Commit: 87b4471e13666b874ef95afa3c941ae32b1f1351 Parents: 34f80ec Author: Akila Perera <[email protected]> Authored: Mon Nov 30 00:18:19 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Mon Nov 30 00:33:47 2015 +0530 ---------------------------------------------------------------------- .../processor/group/GroupStatusProcessor.java | 10 ++--- .../group/GroupStatusTerminatedProcessor.java | 42 +++++++++----------- 2 files changed, 22 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/87b4471e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessor.java index e4ae474..77b98c7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessor.java @@ -41,7 +41,6 @@ import java.util.Map; public abstract class GroupStatusProcessor extends StatusProcessor { private static final Log log = LogFactory.getLog(GroupStatusProcessor.class); - /** * Message processing and delegating logic. * @@ -95,8 +94,8 @@ public abstract class GroupStatusProcessor extends StatusProcessor { * @param status the status to check of the group * @return whether all groups in the same state or not */ - protected boolean getAllClusterInSameState(Map<String, ClusterDataHolder> clusterData, - ClusterStatus status, String instanceId) { + protected boolean getAllClusterInSameState(Map<String, ClusterDataHolder> clusterData, ClusterStatus status, + String instanceId) { boolean clusterStat = false; for (Map.Entry<String, ClusterDataHolder> clusterDataHolderEntry : clusterData.entrySet()) { String serviceName = clusterDataHolderEntry.getValue().getServiceType(); @@ -108,8 +107,8 @@ public abstract class GroupStatusProcessor extends StatusProcessor { ClusterInstance context = cluster.getInstanceContexts(instanceId); if (context != null) { if (log.isDebugEnabled()) { - log.debug("Checking the status of cluster " + clusterId + " instance status is: " + - context.getStatus().toString()); + log.debug(String.format("Cluster instance: [cluster-id] %s, [instance-id] %s, [status] %s", + clusterId, instanceId, context.getStatus().toString())); } if (context.getStatus() == status) { clusterStat = true; @@ -131,5 +130,4 @@ public abstract class GroupStatusProcessor extends StatusProcessor { } return clusterStat; } - } http://git-wip-us.apache.org/repos/asf/stratos/blob/87b4471e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java index fc1a736..4382d8b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java @@ -42,8 +42,7 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor { } @Override - public boolean process(String idOfComponent, String appId, - String instanceId) { + public boolean process(String idOfComponent, String appId, String instanceId) { boolean statusChanged; statusChanged = doProcess(idOfComponent, appId, instanceId); if (statusChanged) { @@ -55,8 +54,8 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor { return nextProcessor.process(idOfComponent, appId, instanceId); } else { - log.warn(String.format("No possible state change found for [component] %s [instance] %s", - idOfComponent, instanceId)); + log.warn(String.format("No possible state change found for [component] %s [instance] %s", idOfComponent, + instanceId)); } return false; } @@ -68,13 +67,12 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor { Map<String, ClusterDataHolder> clusterData; if (log.isDebugEnabled()) { - log.debug("StatusChecker calculating the terminated status for the group " + - "[ " + idOfComponent + " ] " + " for the instance " + " [ " + instanceId + " ]"); + log.debug(String.format( + "GroupStatusTerminatedProcessor is calculating the terminated status for [group-id] %s " + + "[instance-id] %s", idOfComponent, instanceId)); } - + ApplicationHolder.acquireWriteLock(); try { - ApplicationHolder.acquireWriteLock(); - Application application = ApplicationHolder.getApplications(). getApplication(appId); component = application; @@ -88,32 +86,28 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor { groups = component.getAliasToGroupMap(); clusterData = component.getClusterDataMap(); - if (groups.isEmpty() && - getAllClusterInSameState(clusterData, ClusterStatus.Terminated, instanceId) || - clusterData.isEmpty() && - getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId) || - getAllClusterInSameState(clusterData, ClusterStatus.Terminated, instanceId) && - getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId)) { + if (groups.isEmpty() && getAllClusterInSameState(clusterData, ClusterStatus.Terminated, instanceId) || + clusterData.isEmpty() && getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId) || + getAllClusterInSameState(clusterData, ClusterStatus.Terminated, instanceId) + && getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId)) { //send the terminated event if (component instanceof Application) { - log.info("Sending application instance terminated for [application] " + appId - + " [instance] " + instanceId); + log.info(String.format( + "Sending application instance terminated for [application-id] %s, [instance-id] %s", appId, + instanceId)); ApplicationBuilder.handleApplicationInstanceTerminatedEvent(appId, instanceId); return true; } else { - log.info("Sending group instance terminated for [group] " + - component.getUniqueIdentifier() + " [instance] " + instanceId); - ApplicationBuilder.handleGroupInstanceTerminatedEvent(appId, - component.getUniqueIdentifier(), instanceId); + log.info(String.format("Sending group instance terminated for [group-id] %s, [instance-id] %s", + component.getUniqueIdentifier(), instanceId)); + ApplicationBuilder + .handleGroupInstanceTerminatedEvent(appId, component.getUniqueIdentifier(), instanceId); return true; } } } finally { ApplicationHolder.releaseWriteLock(); - } return false; } - - }
