commenting unused methods after making EventReceivers singleton
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/35bec3cb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/35bec3cb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/35bec3cb Branch: refs/heads/stratos-4.1.x Commit: 35bec3cb67c3d3d9f62616b3474309b7a3d6cb1a Parents: 3bb9de9 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Dec 17 16:04:54 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Dec 17 16:04:54 2015 +0530 ---------------------------------------------------------------------- .../AutoscalerHealthStatEventReceiver.java | 31 ------------- .../StratosManagerServiceComponent.java | 49 -------------------- .../status/InstanceStatusEventReceiver.java | 4 -- .../topology/TopologyEventReceiver.java | 8 ---- 4 files changed, 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/35bec3cb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java index 55dc1fa..4201ec1 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java @@ -41,28 +41,12 @@ public class AutoscalerHealthStatEventReceiver { private static final Log log = LogFactory.getLog(AutoscalerHealthStatEventReceiver.class); private HealthStatEventReceiver healthStatEventReceiver; -<<<<<<< HEAD - private ExecutorService executorService; -======= ->>>>>>> d4b35c0... removing unused methods public AutoscalerHealthStatEventReceiver() { this.healthStatEventReceiver = HealthStatEventReceiver.getInstance(); addEventListeners(); } -<<<<<<< HEAD -// public void execute() { -// healthStatEventReceiver.setExecutorService(executorService); -// healthStatEventReceiver.execute(); -// -// if (log.isInfoEnabled()) { -// log.info("Autoscaler health stat event receiver thread started"); -// } -// } - -======= ->>>>>>> d4b35c0... removing unused methods private void addEventListeners() { // Listen to health stat events that affect clusters healthStatEventReceiver.addEventListener(new AverageLoadAverageEventListener() { @@ -480,19 +464,4 @@ public class AutoscalerHealthStatEventReceiver { TopologyManager.releaseReadLock(); } } -<<<<<<< HEAD - - public void terminate() { - this.terminated = true; - } - - public ExecutorService getExecutorService() { - return executorService; - } - - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } -======= ->>>>>>> d4b35c0... removing unused methods } http://git-wip-us.apache.org/repos/asf/stratos/blob/35bec3cb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java index 7c421d9..aa7cc02 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java @@ -193,11 +193,6 @@ public class StratosManagerServiceComponent { private void initializeInitializerEventReceiver() { initializerTopicReceiver = new StratosManagerInitializerTopicReceiver(); -<<<<<<< HEAD -// initializerTopicReceiver.setExecutorService(executorService); -// initializerTopicReceiver.execute(); -======= ->>>>>>> d4b35c0... removing unused methods } /** @@ -205,11 +200,6 @@ public class StratosManagerServiceComponent { */ private void initializeInstanceStatusEventReceiver() { instanceStatusEventReceiver = new StratosManagerInstanceStatusEventReceiver(); -<<<<<<< HEAD -// instanceStatusEventReceiver.setExecutorService(executorService); -// instanceStatusEventReceiver.execute(); -======= ->>>>>>> d4b35c0... removing unused methods } /** @@ -217,11 +207,6 @@ public class StratosManagerServiceComponent { */ private void initializeTopologyEventReceiver() { topologyEventReceiver = new StratosManagerTopologyEventReceiver(); -<<<<<<< HEAD -// topologyEventReceiver.setExecutorService(executorService); -// topologyEventReceiver.execute(); -======= ->>>>>>> d4b35c0... removing unused methods } /** @@ -229,11 +214,6 @@ public class StratosManagerServiceComponent { */ private void initializeApplicationEventReceiver() { applicationEventReceiver = new StratosManagerApplicationEventReceiver(); -<<<<<<< HEAD -// applicationEventReceiver.setExecutorService(executorService); -// applicationEventReceiver.execute(); -======= ->>>>>>> d4b35c0... removing unused methods } /** @@ -348,34 +328,5 @@ public class StratosManagerServiceComponent { // Close event publisher connections to message broker EventPublisherPool.close(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName()); EventPublisherPool.close(MessagingUtil.Topics.TENANT_TOPIC.getTopicName()); -<<<<<<< HEAD - - shutdownExecutorService(THREAD_POOL_ID); - shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID); - } - - private void shutdownExecutorService(String executorServiceId) { - ExecutorService executorService = StratosThreadPool.getExecutorService(executorServiceId, 1); - if (executorService != null) { - shutdownExecutorService(executorService); - } - } - - private void shutdownScheduledExecutorService(String executorServiceId) { - ExecutorService executorService = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1); - if (executorService != null) { - shutdownExecutorService(executorService); - } - } - - private void shutdownExecutorService(ExecutorService executorService) { - try { - executorService.shutdownNow(); - } catch (Exception e) { - log.warn("An error occurred while shutting down executor service", e); - } - } -======= } ->>>>>>> d4b35c0... removing unused methods } http://git-wip-us.apache.org/repos/asf/stratos/blob/35bec3cb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java index 5bc27ff..a2a1623 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java @@ -39,11 +39,7 @@ public class InstanceStatusEventReceiver extends StratosEventReceiver { private InstanceStatusEventReceiver() { // TODO: make pool size configurable -<<<<<<< HEAD this.executorService = StratosThreadPool.getExecutorService("topology-event-receiver", 100); -======= - this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150); ->>>>>>> d4b35c0... removing unused methods InstanceStatusEventMessageQueue messageQueue = new InstanceStatusEventMessageQueue(); this.messageDelegator = new InstanceStatusEventMessageDelegator(messageQueue); this.messageListener = new InstanceStatusEventMessageListener(messageQueue); http://git-wip-us.apache.org/repos/asf/stratos/blob/35bec3cb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java index 50e078a..8378486 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java @@ -117,12 +117,4 @@ public class TopologyEventReceiver extends StratosEventReceiver { } }); } - -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } }
