adding correct logs with instanceIds
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/48c36b03 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/48c36b03 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/48c36b03 Branch: refs/heads/master Commit: 48c36b03dc6485c252bf899b89226ebb411e8ee2 Parents: d6eebe8 Author: reka <[email protected]> Authored: Tue Dec 16 11:13:08 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 18 12:06:57 2014 +0530 ---------------------------------------------------------------------- .../status/processor/group/GroupStatusActiveProcessor.java | 6 ++++-- .../status/processor/group/GroupStatusInactiveProcessor.java | 3 ++- .../status/processor/group/GroupStatusTerminatedProcessor.java | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/48c36b03/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java index 69a6bfa..f7a61b6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java @@ -88,12 +88,14 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor { //send activation event if (component instanceof Application) { //send application activated event - log.info("sending app activate: " + appId); + log.info("sending application active for [application] " + appId + " [instance] " + + instanceId); ApplicationBuilder.handleApplicationInstanceActivatedEvent(appId, instanceId); return true; } else if (component instanceof Group) { //send activation to the parent - log.info("sending group activate: " + component.getUniqueIdentifier()); + log.info("sending group instance active for [group] " + + component.getUniqueIdentifier() + " [instance] " + instanceId); ApplicationBuilder.handleGroupInstanceActivatedEvent(appId, component.getUniqueIdentifier(), instanceId); return true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/48c36b03/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java index 38c9574..105f7e0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java @@ -105,7 +105,8 @@ public class GroupStatusInactiveProcessor extends GroupStatusProcessor { } else if (component instanceof Group) { //send activation to the parent if (((Group) component).getStatus(instanceId) != GroupStatus.Inactive) { - log.info("sending group inactive: " + component.getUniqueIdentifier()); + log.info("sending group instance Inactive for [group] " + + component.getUniqueIdentifier() + " [instance] " + instanceId); ApplicationBuilder.handleGroupInactivateEvent(appId, component.getUniqueIdentifier(), instanceId); return true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/48c36b03/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 578037d..3d786df 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 @@ -91,11 +91,13 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor { getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId)) { //send the terminated event if (component instanceof Application) { - log.info("sending app terminated: " + appId); + log.info("sending application terminated for [application] " + appId + " [instance] " + + instanceId); ApplicationBuilder.handleApplicationInstanceTerminatedEvent(appId, instanceId); return true; } else if (component instanceof Group) { - log.info("sending group terminated : " + component.getUniqueIdentifier()); + log.info("sending group instance terminated for [group] " + + component.getUniqueIdentifier() + " [instance] " + instanceId); ApplicationBuilder.handleGroupInstanceTerminatedEvent(appId, component.getUniqueIdentifier(), instanceId); return true;
