Updated Branches: refs/heads/master 40da0060a -> 15d0ae63c
adding notification seperately for cluster and members Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/15d0ae63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/15d0ae63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/15d0ae63 Branch: refs/heads/master Commit: 15d0ae63cfc1dcd3e2105d735ba3b2f390dd5330 Parents: 40da006 Author: rekathiru <[email protected]> Authored: Fri Jan 10 13:40:00 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 10 13:40:00 2014 +0530 ---------------------------------------------------------------------- .../publisher/InstanceNotificationPublisher.java | 13 +++++++++---- .../service/InstanceCleanupNotificationService.java | 9 +++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/15d0ae63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java index 662bb0d..4e4ed39 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java @@ -25,8 +25,8 @@ import org.apache.stratos.manager.repository.Repository; import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent; -import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupEvent; - +import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent; +import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent; /** * Creating the relevant instance notification event and publish it to the instances. @@ -69,8 +69,13 @@ public class InstanceNotificationPublisher { * * @param memberId */ - public void sendInstanceCleanupEvent(String memberId) { + public void sendInstanceCleanupEventForMember(String memberId) { log.info(String.format("Publishing Instance Cleanup Event: [member] %s", memberId)); - publish(new InstanceCleanupEvent(memberId)); + publish(new InstanceCleanupMemberEvent(memberId)); + } + + public void sendInstanceCleanupEventForCluster(String clusterId) { + log.info(String.format("Publishing Instance Cleanup Event: [cluster] %s", clusterId)); + publish(new InstanceCleanupClusterEvent(clusterId)); } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/15d0ae63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/InstanceCleanupNotificationService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/InstanceCleanupNotificationService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/InstanceCleanupNotificationService.java index bf6ecfd..d8e6e4d 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/InstanceCleanupNotificationService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/service/InstanceCleanupNotificationService.java @@ -30,8 +30,13 @@ import org.wso2.carbon.core.AbstractAdmin; public class InstanceCleanupNotificationService extends AbstractAdmin { private static final Log log = LogFactory.getLog(InstanceCleanupNotificationService.class); - public void sendInstanceCleanupNotificationOnTermination(String memberId) { + public void sendInstanceCleanupNotificationForMember(String memberId) { //sending the notification event to the instance - new InstanceNotificationPublisher().sendInstanceCleanupEvent(memberId); + new InstanceNotificationPublisher().sendInstanceCleanupEventForMember(memberId); + } + + public void sendInstanceCleanupNotificationForCluster(String clusterId) { + //sending the notification event to the cluster + new InstanceNotificationPublisher().sendInstanceCleanupEventForCluster(clusterId); } }
