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 2015/12/24 15:56:13 UTC
[10/14] stratos git commit: removing unused methods
removing unused methods
Conflicts:
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/933be1a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/933be1a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/933be1a1
Branch: refs/heads/master
Commit: 933be1a145946d81f59de58a865758c3c3155a35
Parents: 412cb2c
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Dec 8 07:32:06 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Thu Dec 24 20:05:30 2015 +0530
----------------------------------------------------------------------
.../AutoscalerHealthStatEventReceiver.java | 10 ++-
.../AutoscalerInitializerTopicReceiver.java | 17 -----
.../AutoscalerTopologyEventReceiver.java | 17 -----
.../internal/AutoscalerServiceComponent.java | 67 +-------------------
.../CloudControllerServiceComponent.java | 59 -----------------
.../application/ApplicationEventReceiver.java | 13 ----
.../StratosManagerServiceComponent.java | 16 +++++
.../mapping/DomainMappingEventReceiver.java | 13 ----
.../notifier/InstanceNotifierEventReceiver.java | 36 -----------
.../status/InstanceStatusEventReceiver.java | 4 ++
.../tests/PythonAgentIntegrationTest.java | 7 +-
.../integration/common/TopologyHandler.java | 12 +---
12 files changed, 37 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 0b13500..55dc1fa 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,16 +39,19 @@ import java.util.concurrent.ExecutorService;
public class AutoscalerHealthStatEventReceiver {
private static final Log log = LogFactory.getLog(AutoscalerHealthStatEventReceiver.class);
- private boolean terminated = false;
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();
@@ -58,6 +61,8 @@ public class AutoscalerHealthStatEventReceiver {
// }
// }
+=======
+>>>>>>> d4b35c0... removing unused methods
private void addEventListeners() {
// Listen to health stat events that affect clusters
healthStatEventReceiver.addEventListener(new AverageLoadAverageEventListener() {
@@ -475,6 +480,7 @@ public class AutoscalerHealthStatEventReceiver {
TopologyManager.releaseReadLock();
}
}
+<<<<<<< HEAD
public void terminate() {
this.terminated = true;
@@ -487,4 +493,6 @@ public class AutoscalerHealthStatEventReceiver {
public void setExecutorService(ExecutorService executorService) {
this.executorService = executorService;
}
+=======
+>>>>>>> d4b35c0... removing unused methods
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 b330211..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.setExecutorService(executorService);
-// 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 getExecutorService() {
- return executorService;
- }
-
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 daa70ae..e2b417e 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 getExecutorService() {
-// return executorService;
-// }
-//
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 bb28577..881c3ab 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
@@ -173,27 +173,10 @@ public class AutoscalerServiceComponent {
// Start topology receiver
asTopologyReceiver = new AutoscalerTopologyEventReceiver();
-// asTopologyReceiver.setExecutorService(executorService);
- //asTopologyReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Topology receiver executor service started");
- }
-
// Start health stat receiver
autoscalerHealthStatEventReceiver = new AutoscalerHealthStatEventReceiver();
-// autoscalerHealthStatEventReceiver.setExecutorService(executorService);
-// autoscalerHealthStatEventReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Health statistics receiver thread started");
- }
-
// Start initializer receiver
autoscalerInitializerTopicReceiver = new AutoscalerInitializerTopicReceiver();
-// autoscalerInitializerTopicReceiver.setExecutorService(executorService);
-// autoscalerInitializerTopicReceiver.execute();
-// if (log.isDebugEnabled()) {
-// log.debug("Initializer receiver thread started");
-// }
if (log.isInfoEnabled()) {
log.info("Scheduling tasks to publish applications");
@@ -245,54 +228,8 @@ 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);
- }
- }
-
- // 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) {
- 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);
+ if (log.isDebugEnabled()) {
+ log.debug("Autoscaler Component de-activated");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 267d5a8..c30fc63 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
@@ -146,40 +146,9 @@ public class CloudControllerServiceComponent {
private void executeCoordinatorTasks() {
applicationEventReceiver = new ApplicationEventReceiver();
-// applicationEventReceiver.setExecutorService(executorService);
-// applicationEventReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Application event receiver thread started");
- }
-
clusterStatusTopicReceiver = new ClusterStatusTopicReceiver();
-// clusterStatusTopicReceiver.setExecutorService(executorService);
-// clusterStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Cluster status event receiver thread started");
- }
-
instanceStatusTopicReceiver = new InstanceStatusTopicReceiver();
-// instanceStatusTopicReceiver.setExecutorService(executorService);
-// instanceStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Instance status event receiver thread started");
- }
-
initializerTopicReceiver = new InitializerTopicReceiver();
-// initializerTopicReceiver.setExecutorService(executorService);
-// 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);
}
@@ -260,33 +229,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) {
- 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);
- }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 8da5575..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 executorService;
public ApplicationEventReceiver() {
this.applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
addEventListeners();
}
-// public void execute() {
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller application event receiver thread started");
-// }
-// applicationsEventReceiver.setExecutorService(executorService);
-// applicationsEventReceiver.execute();
-// }
-
private void addEventListeners() {
applicationsEventReceiver.addEventListener(new ApplicationInstanceTerminatedEventListener() {
@Override
@@ -75,8 +66,4 @@ public class ApplicationEventReceiver {
}
});
}
-
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 c4d68ae..7c421d9 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,8 +193,11 @@ public class StratosManagerServiceComponent {
private void initializeInitializerEventReceiver() {
initializerTopicReceiver = new StratosManagerInitializerTopicReceiver();
+<<<<<<< HEAD
// initializerTopicReceiver.setExecutorService(executorService);
// initializerTopicReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
}
/**
@@ -202,8 +205,11 @@ public class StratosManagerServiceComponent {
*/
private void initializeInstanceStatusEventReceiver() {
instanceStatusEventReceiver = new StratosManagerInstanceStatusEventReceiver();
+<<<<<<< HEAD
// instanceStatusEventReceiver.setExecutorService(executorService);
// instanceStatusEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
}
/**
@@ -211,8 +217,11 @@ public class StratosManagerServiceComponent {
*/
private void initializeTopologyEventReceiver() {
topologyEventReceiver = new StratosManagerTopologyEventReceiver();
+<<<<<<< HEAD
// topologyEventReceiver.setExecutorService(executorService);
// topologyEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
}
/**
@@ -220,8 +229,11 @@ public class StratosManagerServiceComponent {
*/
private void initializeApplicationEventReceiver() {
applicationEventReceiver = new StratosManagerApplicationEventReceiver();
+<<<<<<< HEAD
// applicationEventReceiver.setExecutorService(executorService);
// applicationEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
}
/**
@@ -336,6 +348,7 @@ 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);
@@ -362,4 +375,7 @@ public class StratosManagerServiceComponent {
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/933be1a1/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 6b79873..a37941c 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
@@ -91,17 +91,4 @@ public class DomainMappingEventReceiver extends StratosEventReceiver {
}
}
}
-
-// public void terminate() {
-// eventSubscriber.terminate();
-// messageDelegator.terminate();
-// }
-//
-// public ExecutorService getExecutorService() {
-// return executorService;
-// }
-//
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 cfc7f11..33f5de8 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
@@ -66,42 +66,6 @@ public class InstanceNotifierEventReceiver extends StratosEventReceiver {
messageDelegator.addEventListener(eventListener);
}
-// public void execute() {
-// synchronized (this) {
-// if (terminated) {
-// log.info("InstanceNotifierEventReceiver has been terminated. Event subscriber will not be created.");
-// return;
-// }
-// try {
-// Thread subscriberThread = new Thread(eventSubscriber);
-// subscriberThread.start();
-// if (log.isDebugEnabled()) {
-// log.debug("InstanceNotifier event message receiver thread started");
-// }
-//
-// // Start instance notifier event message delegator thread
-// Thread receiverThread = new Thread(messageDelegator);
-// receiverThread.start();
-// if (log.isDebugEnabled()) {
-// log.debug("InstanceNotifier event message delegator thread started");
-// }
-// } catch (Exception e) {
-// if (log.isErrorEnabled()) {
-// log.error("InstanceNotifier receiver failed", e);
-// }
-// }
-// }
-// log.info("InstanceNotifierEventReceiver started");
-//
-// // Keep the thread live until terminated
-// while (!terminated) {
-// try {
-// Thread.sleep(2000);
-// } catch (InterruptedException ignore) {
-// }
-// }
-// }
-
private void execute() {
try {
// Start topic subscriber thread
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/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 a2a1623..5bc27ff 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,11 @@ 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/933be1a1/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
index 4a86e40..aa0a802 100644
--- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
+++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
@@ -124,7 +124,8 @@ public abstract class PythonAgentIntegrationTest {
startActiveMQInstance(Integer.parseInt(amqpBindPorts[i]), Integer.parseInt(mqttBindPorts[i]), true);
}
- ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", testThreadPoolSize);
+ //ExecutorService executorService = StratosThreadPool.getExecutorService
+ // ("TEST_THREAD_POOL");
topologyEventReceiver = TopologyEventReceiver.getInstance();
// topologyEventReceiver.setExecutorService(executorService);
// topologyEventReceiver.execute();
@@ -149,9 +150,7 @@ public abstract class PythonAgentIntegrationTest {
}
});
- initializerEventReceiver = new InitializerEventReceiver();
- initializerEventReceiver.setExecutorService(executorService);
- initializerEventReceiver.execute();
+ initializerEventReceiver = InitializerEventReceiver.getInstance();
this.eventReceiverInitialized = true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/933be1a1/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
index e506ef7..d115970 100644
--- a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
+++ b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
@@ -114,17 +114,14 @@ public class TopologyHandler {
}
private void initializeTenantEventReceiver() {
- tenantEventReceiver = new TenantEventReceiver();
- tenantEventReceiver.setExecutorService(executorService);
- tenantEventReceiver.execute();
+ tenantEventReceiver = TenantEventReceiver.getInstance();
}
/**
* Initialize application event receiver
*/
private void initializeHealthStatsEventReceiver() {
- healthStatEventReceiver = new HealthStatEventReceiver();
- healthStatEventReceiver.setExecutorService(executorService);
+ healthStatEventReceiver = HealthStatEventReceiver.getInstance();
healthStatEventReceiver.addEventListener(new MemberFaultEventListener() {
@Override
protected void onEvent(Event event) {
@@ -133,15 +130,13 @@ public class TopologyHandler {
memberFaultEvent.getMemberId()));
}
});
- healthStatEventReceiver.execute();
}
/**
* Initialize application event receiver
*/
private void initializeApplicationEventReceiver() {
- applicationsEventReceiver = new ApplicationsEventReceiver();
- applicationsEventReceiver.setExecutorService(executorService);
+ applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
applicationsEventReceiver.addEventListener(new ApplicationInstanceActivatedEventListener() {
@Override
protected void onEvent(Event event) {
@@ -164,7 +159,6 @@ public class TopologyHandler {
appInstanceInactivatedEvent.getInstanceId()));
}
});
- applicationsEventReceiver.execute();
}
/**