You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2016/01/05 16:47:26 UTC
[17/50] [abbrv] stratos git commit: removing unused methods
removing unused methods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d4b35c0f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d4b35c0f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d4b35c0f
Branch: refs/heads/stratos-4.1.x
Commit: d4b35c0f0b1c0441a325781742f038009946e1db
Parents: 4b15a1b
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Dec 8 07:32:06 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Dec 8 07:32:06 2015 +0530
----------------------------------------------------------------------
.../AutoscalerHealthStatEventReceiver.java | 23 -------
.../AutoscalerInitializerTopicReceiver.java | 17 -----
.../AutoscalerTopologyEventReceiver.java | 17 -----
.../internal/AutoscalerServiceComponent.java | 67 +-------------------
.../CloudControllerServiceComponent.java | 59 -----------------
.../application/ApplicationEventReceiver.java | 13 ----
.../StratosManagerServiceComponent.java | 41 ------------
.../application/ApplicationsEventReceiver.java | 2 +-
.../signup/ApplicationSignUpEventReceiver.java | 2 +-
.../status/ClusterStatusEventReceiver.java | 2 +-
.../mapping/DomainMappingEventReceiver.java | 3 +-
.../health/stat/HealthStatEventReceiver.java | 2 +-
.../initializer/InitializerEventReceiver.java | 2 +-
.../notifier/InstanceNotifierEventReceiver.java | 2 +-
.../status/InstanceStatusEventReceiver.java | 2 +-
.../receiver/tenant/TenantEventReceiver.java | 2 +-
.../topology/TopologyEventReceiver.java | 2 +-
17 files changed, 12 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/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 42d7771..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
@@ -39,25 +39,14 @@ import java.util.concurrent.ExecutorService;
public class AutoscalerHealthStatEventReceiver {
private static final Log log = LogFactory.getLog(AutoscalerHealthStatEventReceiver.class);
- private boolean terminated = false;
private HealthStatEventReceiver healthStatEventReceiver;
- // private ExecutorService executorService;
public AutoscalerHealthStatEventReceiver() {
this.healthStatEventReceiver = HealthStatEventReceiver.getInstance();
addEventListeners();
}
-// public void execute() {
-// healthStatEventReceiver.setExecutor(executor);
-// healthStatEventReceiver.execute();
-//
-// if (log.isInfoEnabled()) {
-// log.info("Autoscaler health stat event receiver thread started");
-// }
-// }
-
private void addEventListeners() {
// Listen to health stat events that affect clusters
healthStatEventReceiver.addEventListener(new AverageLoadAverageEventListener() {
@@ -475,16 +464,4 @@ public class AutoscalerHealthStatEventReceiver {
TopologyManager.releaseReadLock();
}
}
-
- public void terminate() {
- this.terminated = true;
- }
-
-// public ExecutorService getExecutor() {
-// return executorService;
-// }
-//
-// public void setExecutor(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
index e1dbd7f..33b93ed 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
@@ -31,21 +31,12 @@ import java.util.concurrent.ExecutorService;
public class AutoscalerInitializerTopicReceiver {
private static final Log log = LogFactory.getLog(AutoscalerInitializerTopicReceiver.class);
private InitializerEventReceiver initializerEventReceiver;
- //private ExecutorService executorService;
public AutoscalerInitializerTopicReceiver() {
this.initializerEventReceiver = InitializerEventReceiver.getInstance();
addEventListeners();
}
-// public void execute() {
-// initializerEventReceiver.setExecutor(executor);
-// initializerEventReceiver.execute();
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller initializer topic receiver started");
-// }
-// }
-
private void addEventListeners() {
initializerEventReceiver.addEventListener(new CompleteApplicationsRequestEventListener() {
@Override
@@ -61,12 +52,4 @@ public class AutoscalerInitializerTopicReceiver {
}
});
}
-
-// public ExecutorService getExecutor() {
-// return executorService;
-// }
-//
-// public void setExecutor(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index b0af42a..c150a1f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -55,7 +55,6 @@ import java.util.concurrent.ExecutorService;
public class AutoscalerTopologyEventReceiver {
private static final Log log = LogFactory.getLog(AutoscalerTopologyEventReceiver.class);
private TopologyEventReceiver topologyEventReceiver;
- private boolean terminated;
private boolean topologyInitialized;
//private ExecutorService executorService;
@@ -506,20 +505,4 @@ public class AutoscalerTopologyEventReceiver {
}
});
}
-
- /**
- * Terminate load balancer topology receiver thread.
- */
-// public void terminate() {
-// topologyEventReceiver.terminate();
-// terminated = true;
-// }
-//
-// public ExecutorService getExecutor() {
-// return executor;
-// }
-//
-// public void setExecutor(ExecutorService executor) {
-// this.executor = executor;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
index 9b1a290..bcd4fc1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
@@ -171,27 +171,10 @@ public class AutoscalerServiceComponent {
// Start topology receiver
asTopologyReceiver = new AutoscalerTopologyEventReceiver();
-// asTopologyReceiver.setExecutor(executor);
- //asTopologyReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Topology receiver executor service started");
- }
-
// Start health stat receiver
autoscalerHealthStatEventReceiver = new AutoscalerHealthStatEventReceiver();
-// autoscalerHealthStatEventReceiver.setExecutor(executor);
-// autoscalerHealthStatEventReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Health statistics receiver thread started");
- }
-
// Start initializer receiver
autoscalerInitializerTopicReceiver = new AutoscalerInitializerTopicReceiver();
-// autoscalerInitializerTopicReceiver.setExecutor(executor);
-// autoscalerInitializerTopicReceiver.execute();
-// if (log.isDebugEnabled()) {
-// log.debug("Initializer receiver thread started");
-// }
if (log.isInfoEnabled()) {
log.info("Scheduling tasks to publish applications");
@@ -243,57 +226,11 @@ public class AutoscalerServiceComponent {
}
protected void deactivate(ComponentContext context) {
-// if (asTopologyReceiver != null) {
-// try {
-// asTopologyReceiver.terminate();
-// } catch (Exception e) {
-// log.warn("An error occurred while terminating autoscaler topology event receiver", e);
-// }
-// }
-
- if (autoscalerHealthStatEventReceiver != null) {
- try {
- autoscalerHealthStatEventReceiver.terminate();
- } catch (Exception e) {
- log.warn("An error occurred while terminating autoscaler health statistics event receiver", e);
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Autoscaler Component de-activated");
}
-
- // Shutdown executor service
- //shutdownExecutorService(AutoscalerConstants.AUTOSCALER_THREAD_POOL_ID);
-
- // Shutdown scheduler
- //shutdownScheduledExecutorService(AutoscalerConstants.AUTOSCALER_SCHEDULER_ID);
-
- // Shutdown application monitor executor service
- //shutdownExecutorService(AutoscalerConstants.MONITOR_THREAD_POOL_ID);
-
- // Shutdown cluster monitor scheduler executor service
- //shutdownScheduledExecutorService(AutoscalerConstants.CLUSTER_MONITOR_SCHEDULER_ID);
}
-// private void shutdownExecutorService(String executorServiceId) {
-// ThreadPoolExecutor executor = StratosThreadPool.getExecutorService(executorServiceId, 1, 1);
-// if (executor != null) {
-// shutdownExecutorService(executor);
-// }
-// }
-//
-// private void shutdownScheduledExecutorService(String executorServiceId) {
-// ScheduledThreadPoolExecutor scheduledExecutor = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1);
-// if (scheduledExecutor != null) {
-// shutdownExecutorService(scheduledExecutor);
-// }
-// }
-//
-// private void shutdownExecutorService(ExecutorService executorService) {
-// try {
-// executorService.shutdownNow();
-// } catch (Exception e) {
-// log.warn("An error occurred while shutting down executor service", e);
-// }
-// }
-
protected void setRegistryService(RegistryService registryService) {
if (log.isDebugEnabled()) {
log.debug("Setting the Registry Service");
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
index 0d02d46..62f3f29 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -145,40 +145,9 @@ public class CloudControllerServiceComponent {
private void executeCoordinatorTasks() {
applicationEventReceiver = new ApplicationEventReceiver();
-// applicationEventReceiver.setExecutorService(executor);
-// applicationEventReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Application event receiver thread started");
- }
-
clusterStatusTopicReceiver = new ClusterStatusTopicReceiver();
-// clusterStatusTopicReceiver.setExecutorService(executor);
-// clusterStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Cluster status event receiver thread started");
- }
-
instanceStatusTopicReceiver = new InstanceStatusTopicReceiver();
-// instanceStatusTopicReceiver.setExecutorService(executor);
-// instanceStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Instance status event receiver thread started");
- }
-
initializerTopicReceiver = new InitializerTopicReceiver();
-// initializerTopicReceiver.setExecutorService(executor);
-// initializerTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Initializer event receiver thread started");
- }
-
- if (log.isInfoEnabled()) {
- log.info("Scheduling topology synchronizer task");
- }
Runnable topologySynchronizer = new TopologyEventSynchronizer();
scheduler.scheduleAtFixedRate(topologySynchronizer, 0, 1, TimeUnit.MINUTES);
}
@@ -259,33 +228,5 @@ public class CloudControllerServiceComponent {
} catch (Exception e) {
log.warn("An error occurred while closing cloud controller topology event publisher", e);
}
-
- // Shutdown executor service
- //shutdownExecutorService(THREAD_POOL_ID);
-
- // Shutdown scheduler
- shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID);
- }
-
-// private void shutdownExecutorService(String executorServiceId) {
-// ThreadPoolExecutor executor = StratosThreadPool.getExecutorService(executorServiceId, 1, 1);
-// if (executor != null) {
-// shutdownExecutorService(executor);
-// }
-// }
-
- 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);
- }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
index 26290b7..65bef23 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
@@ -37,21 +37,12 @@ import java.util.concurrent.ExecutorService;
public class ApplicationEventReceiver {
private static final Log log = LogFactory.getLog(ApplicationEventReceiver.class);
private ApplicationsEventReceiver applicationsEventReceiver;
- // private ExecutorService executor;
public ApplicationEventReceiver() {
this.applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
addEventListeners();
}
-// public void execute() {
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller application event receiver thread started");
-// }
-// applicationsEventReceiver.setExecutorService(executor);
-// applicationsEventReceiver.execute();
-// }
-
private void addEventListeners() {
applicationsEventReceiver.addEventListener(new ApplicationInstanceTerminatedEventListener() {
@Override
@@ -75,8 +66,4 @@ public class ApplicationEventReceiver {
}
});
}
-
-// public void setExecutorService(ExecutorService executor) {
-// this.executor = executor;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/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 7de06ae..0dbc417 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
@@ -192,8 +192,6 @@ public class StratosManagerServiceComponent {
private void initializeInitializerEventReceiver() {
initializerTopicReceiver = new StratosManagerInitializerTopicReceiver();
-// initializerTopicReceiver.setExecutorService(executor);
-// initializerTopicReceiver.execute();
}
/**
@@ -201,8 +199,6 @@ public class StratosManagerServiceComponent {
*/
private void initializeInstanceStatusEventReceiver() {
instanceStatusEventReceiver = new StratosManagerInstanceStatusEventReceiver();
-// instanceStatusEventReceiver.setExecutorService(executor);
-// instanceStatusEventReceiver.execute();
}
/**
@@ -210,8 +206,6 @@ public class StratosManagerServiceComponent {
*/
private void initializeTopologyEventReceiver() {
topologyEventReceiver = new StratosManagerTopologyEventReceiver();
-// topologyEventReceiver.setExecutorService(executor);
-// topologyEventReceiver.execute();
}
/**
@@ -219,8 +213,6 @@ public class StratosManagerServiceComponent {
*/
private void initializeApplicationEventReceiver() {
applicationEventReceiver = new StratosManagerApplicationEventReceiver();
-// applicationEventReceiver.setExecutorService(executor);
-// applicationEventReceiver.execute();
}
/**
@@ -335,38 +327,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());
-
- //shutdownExecutor(THREAD_POOL_ID);
- //shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID);
}
-
-// private void shutdownExecutor(String executorServiceId) {
-// ThreadPoolExecutor executor = StratosThreadPool.getExecutorService(executorServiceId, 1, 1);
-// if (executor != null) {
-// shutdownExecutor(executor);
-// }
-// }
-
-// private void shutdownScheduledExecutorService(String executorServiceId) {
-// ScheduledThreadPoolExecutor scheduledExecutor = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1);
-// if (scheduledExecutor != null) {
-// shutdownExecutor(scheduledExecutor);
-// }
-// }
-
-// private void shutdownExecutor(ThreadPoolExecutor executor) {
-// try {
-// executor.shutdownNow();
-// } catch (Exception e) {
-// log.warn("An error occurred while shutting down executor service", e);
-// }
-// }
-
-// private void shutdownExecutor(ExecutorService executorService) {
-// try {
-// executorService.shutdownNow();
-// } catch (Exception e) {
-// log.warn("An error occurred while shutting down executor service", e);
-// }
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
index 78998c7..f9a14ae 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
@@ -39,7 +39,7 @@ public class ApplicationsEventReceiver extends StratosEventReceiver{
private ApplicationsEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("application-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
ApplicationsEventMessageQueue messageQueue = new ApplicationsEventMessageQueue();
this.messageDelegator = new ApplicationsEventMessageDelegator(messageQueue);
this.messageListener = new ApplicationsEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
index 65ca857..49964f9 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
@@ -44,7 +44,7 @@ public class ApplicationSignUpEventReceiver extends StratosEventReceiver {
private ApplicationSignUpEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("application-signup-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
ApplicationSignUpEventMessageQueue messageQueue = new ApplicationSignUpEventMessageQueue();
this.messageDelegator = new ApplicationSignUpEventMessageDelegator(messageQueue);
this.messageListener = new ApplicationSignUpEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
index fbfbc4b..aae1cef 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
@@ -39,7 +39,7 @@ public class ClusterStatusEventReceiver extends StratosEventReceiver {
private ClusterStatusEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("clusterstatus-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
ClusterStatusEventMessageQueue messageQueue = new ClusterStatusEventMessageQueue();
this.messageDelegator = new ClusterStatusEventMessageDelegator(messageQueue);
this.messageListener = new ClusterStatusEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
index 5d80d32..1348db0 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
@@ -41,8 +41,7 @@ public class DomainMappingEventReceiver extends StratosEventReceiver {
private DomainMappingEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("domainmapping-event-receiver", 35,
- 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
DomainMappingEventMessageQueue messageQueue = new DomainMappingEventMessageQueue();
this.messageDelegator = new DomainMappingEventMessageDelegator(messageQueue);
this.messageListener = new DomainMappingEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
index e7dfb46..4be2fea 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
@@ -40,7 +40,7 @@ public class HealthStatEventReceiver extends StratosEventReceiver {
private HealthStatEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("healthstat-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
HealthStatEventMessageQueue messageQueue = new HealthStatEventMessageQueue();
this.messageDelegator = new HealthStatEventMessageDelegator(messageQueue);
this.messageListener = new HealthStatEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
index 15e1b64..f2e2131 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
@@ -37,7 +37,7 @@ public class InitializerEventReceiver extends StratosEventReceiver {
private InitializerEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("initializer-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
InitializerEventMessageQueue initializerEventMessageQueue = new InitializerEventMessageQueue();
this.messageDelegator = new InitializerEventMessageDelegator(initializerEventMessageQueue);
this.messageListener = new InitializerEventMessageListener(initializerEventMessageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
index e06a2e6..2d8ed62 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
@@ -40,7 +40,7 @@ public class InstanceNotifierEventReceiver extends StratosEventReceiver {
private InstanceNotifierEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("topology-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
InstanceNotifierEventMessageQueue messageQueue = new InstanceNotifierEventMessageQueue();
this.messageDelegator = new InstanceNotifierEventMessageDelegator(messageQueue);
messageListener = new InstanceNotifierEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/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 867f461..4126f69 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,7 +39,7 @@ public class InstanceStatusEventReceiver extends StratosEventReceiver {
private InstanceStatusEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("topology-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
InstanceStatusEventMessageQueue messageQueue = new InstanceStatusEventMessageQueue();
this.messageDelegator = new InstanceStatusEventMessageDelegator(messageQueue);
this.messageListener = new InstanceStatusEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
index 39ef2fb..1d55ce4 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
@@ -43,7 +43,7 @@ public class TenantEventReceiver extends StratosEventReceiver {
private TenantEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("tenant-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
TenantEventMessageQueue messageQueue = new TenantEventMessageQueue();
this.messageDelegator = new TenantEventMessageDelegator(messageQueue);
this.messageListener = new TenantEventMessageListener(messageQueue);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b35c0f/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 ea1571e..648a8fb 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
@@ -45,7 +45,7 @@ public class TopologyEventReceiver extends StratosEventReceiver {
private TopologyEventReceiver() {
// TODO: make pool size configurable
- this.executor = StratosThreadPool.getExecutorService("topology-event-receiver", 35, 100);
+ this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150);
TopologyEventMessageQueue messageQueue = new TopologyEventMessageQueue();
this.messageDelegator = new TopologyEventMessageDelegator(messageQueue);
this.messageListener = new TopologyEventMessageListener(messageQueue);