Removed mistakenly added Tenant event listeners Removed unused extension util methods Removed unused methods and imports in CartridgeAgent
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1a85937 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1a85937 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1a85937 Branch: refs/heads/master Commit: e1a85937e13a3059dbbf82ec2f49b28ad41a5bf1 Parents: 0c968f4 Author: Chamila de Alwis <[email protected]> Authored: Mon Sep 22 17:10:01 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 15:50:29 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 88 -------------------- .../cartridge/agent/util/ExtensionUtils.java | 28 ------- 2 files changed, 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e1a85937/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index 778bbdf..e300ec5 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -32,8 +32,6 @@ import org.apache.stratos.cartridge.agent.extensions.DefaultExtensionHandler; import org.apache.stratos.cartridge.agent.extensions.ExtensionHandler; import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants; import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils; -import org.apache.stratos.cartridge.agent.util.ExtensionUtils; -import org.apache.stratos.messaging.domain.tenant.Tenant; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent; import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent; @@ -48,30 +46,18 @@ import org.apache.stratos.messaging.listener.tenant.SubscriptionDomainsRemovedEv import org.apache.stratos.messaging.message.receiver.instance.notifier.InstanceNotifierEventReceiver; import org.apache.stratos.messaging.message.receiver.tenant.TenantEventReceiver; import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent; -import org.apache.stratos.messaging.event.tenant.SubscriptionDomainAddedEvent; -import org.apache.stratos.messaging.event.tenant.SubscriptionDomainRemovedEvent; import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent; import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent; import org.apache.stratos.messaging.event.topology.*; -import org.apache.stratos.messaging.listener.instance.notifier.ArtifactUpdateEventListener; -import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupClusterEventListener; -import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupMemberEventListener; import org.apache.stratos.messaging.listener.tenant.CompleteTenantEventListener; -import org.apache.stratos.messaging.listener.tenant.SubscriptionDomainsAddedEventListener; -import org.apache.stratos.messaging.listener.tenant.SubscriptionDomainsRemovedEventListener; import org.apache.stratos.messaging.listener.tenant.TenantSubscribedEventListener; import org.apache.stratos.messaging.listener.tenant.TenantUnSubscribedEventListener; import org.apache.stratos.messaging.listener.topology.*; -import org.apache.stratos.messaging.message.receiver.instance.notifier.InstanceNotifierEventReceiver; -import org.apache.stratos.messaging.message.receiver.tenant.TenantEventReceiver; import org.apache.stratos.messaging.message.receiver.tenant.TenantManager; import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; /** * Cartridge agent runnable. @@ -254,64 +240,6 @@ public class CartridgeAgent implements Runnable { log.info("Instance notifier event message receiver thread started"); } - if(log.isDebugEnabled()) { - log.debug("Starting tenant event message receiver thread"); - } - TenantEventReceiver tenantEventReceiver = new TenantEventReceiver(); - - tenantEventReceiver.addEventListener(new SubscriptionDomainsAddedEventListener() { - @Override - protected void onEvent(Event event) { - try { - SubscriptionDomainAddedEvent subscriptionDomainAddedEvent = (SubscriptionDomainAddedEvent) event; - ExtensionUtils.executeSubscriptionDomainAddedExtension( - subscriptionDomainAddedEvent.getTenantId(), - findTenantDomain(subscriptionDomainAddedEvent.getTenantId()), - subscriptionDomainAddedEvent.getDomainName(), - subscriptionDomainAddedEvent.getApplicationContext()); - } - catch (Exception e) { - if(log.isErrorEnabled()) { - log.error("Could not process subscription domain added event", e); - } - } - } - }); - - tenantEventReceiver.addEventListener(new SubscriptionDomainsRemovedEventListener() { - @Override - protected void onEvent(Event event) { - try { - SubscriptionDomainRemovedEvent subscriptionDomainRemovedEvent = (SubscriptionDomainRemovedEvent) event; - ExtensionUtils.executeSubscriptionDomainRemovedExtension( - subscriptionDomainRemovedEvent.getTenantId(), - findTenantDomain(subscriptionDomainRemovedEvent.getTenantId()), - subscriptionDomainRemovedEvent.getDomainName()); - } - catch (Exception e) { - if(log.isErrorEnabled()) { - log.error("Could not process subscription domain removed event", e); - } - } - } - }); - - Thread tenantEventReceiverThread = new Thread(tenantEventReceiver); - tenantEventReceiverThread.start(); - if(log.isInfoEnabled()) { - log.info("Tenant event message receiver thread started"); - } - - Thread instanceNotifierEventReceiverThread = new Thread(instanceNotifierEventReceiver); - instanceNotifierEventReceiverThread.start(); - if (log.isInfoEnabled()) { - log.info("Instance notifier event message receiver thread started"); - } - - if (log.isDebugEnabled()) { - log.debug("Starting tenant event message receiver thread"); - } - // Wait until message receiver is subscribed to the topic to send the instance started event while (!instanceNotifierEventReceiver.isSubscribed()) { try { @@ -664,20 +592,4 @@ public class CartridgeAgent implements Runnable { public void terminate() { terminated = true; } - - private String findTenantDomain(int tenantId) { - try { - TenantManager.acquireReadLock(); - Tenant tenant = TenantManager.getInstance().getTenant(tenantId); - if(tenant == null) { - throw new RuntimeException(String.format("Tenant could not be found: [tenant-id] %d", tenantId)); - } - return tenant.getTenantDomain(); - } - finally { - TenantManager.releaseReadLock(); - } - } - - } http://git-wip-us.apache.org/repos/asf/stratos/blob/e1a85937/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java index ac61f86..994c589 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java @@ -575,32 +575,4 @@ public class ExtensionUtils { } return true; } - - public static void executeSubscriptionDomainAddedExtension(int tenantId, String tenantDomain, String domainName, String applicationContext) { - try { - if(log.isDebugEnabled()) { - log.debug(String.format("Executing subscription domain added extension: [tenant-id] %d [tenant-domain] %s " + - "[domain-name] %s [application-context] %s", tenantId, tenantDomain, domainName, applicationContext)); - } - String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_ADDED_SH + " " + domainName + " " + applicationContext); - CommandUtils.executeCommand(command); - } - catch (Exception e) { - log.error("Could not execute subscription domain added extension", e); - } - } - - public static void executeSubscriptionDomainRemovedExtension(int tenantId, String tenantDomain, String domainName) { - try { - if(log.isDebugEnabled()) { - log.debug(String.format("Executing subscription domain removed extension: [tenant-id] %d [tenant-domain] %s " + - "[domain-name] %s [application-context] %s", tenantId, tenantDomain, domainName)); - } - String command = prepareCommand(CartridgeAgentConstants.SUBSCRIPTION_DOMAIN_REMOVED_SH + " " + domainName); - CommandUtils.executeCommand(command); - } - catch (Exception e) { - log.error("Could not execute subscription domain removed extension", e); - } - } }
