Repository: incubator-stratos Updated Branches: refs/heads/master bba371dfd -> f6b09d30d
fixing the member fualt occurring for the instances which are IN_MAINTENANCE Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f6b09d30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6b09d30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6b09d30 Branch: refs/heads/master Commit: f6b09d30d9ef0f6239e045832364896f2437c5d3 Parents: bba371d Author: rekathiru <[email protected]> Authored: Mon Feb 24 16:58:34 2014 +0530 Committer: rekathiru <[email protected]> Committed: Mon Feb 24 16:58:34 2014 +0530 ---------------------------------------------------------------------- .../publisher/CartridgeAgentEventPublisher.java | 48 ++++++++++++++++---- .../publisher/HealthStatisticsNotifier.java | 4 +- 2 files changed, 43 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f6b09d30/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java index df2f1ac..82420c7 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java @@ -23,7 +23,7 @@ public class CartridgeAgentEventPublisher { private static boolean maintenance; public static void publishInstanceStartedEvent() { - if (!started) { + if (!isStarted()) { if (log.isInfoEnabled()) { log.info("Publishing instance started event"); } @@ -36,7 +36,7 @@ public class CartridgeAgentEventPublisher { EventPublisher eventPublisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); - started = true; + setStarted(true); if (log.isInfoEnabled()) { log.info("Instance started event published"); } @@ -50,7 +50,7 @@ public class CartridgeAgentEventPublisher { } public static void publishInstanceActivatedEvent() { - if (!activated) { + if (!isActivated()) { if (log.isInfoEnabled()) { log.info("Publishing instance activated event"); } @@ -74,7 +74,7 @@ public class CartridgeAgentEventPublisher { } Thread thread = new Thread(new HealthStatisticsNotifier()); thread.start(); - activated = true; + setActivated(true); if (log.isInfoEnabled()) { log.info("Health statistics notifier started"); } @@ -86,7 +86,7 @@ public class CartridgeAgentEventPublisher { } public static void publishInstanceReadyToShutdownEvent() { - if (!readyToShutdown) { + if (!isReadyToShutdown()) { if (log.isInfoEnabled()) { log.info("Publishing instance activated event"); } @@ -99,7 +99,7 @@ public class CartridgeAgentEventPublisher { EventPublisher eventPublisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); - readyToShutdown = true; + setReadyToShutdown(true); if (log.isInfoEnabled()) { log.info("Instance ReadyToShutDown event published"); } @@ -111,7 +111,7 @@ public class CartridgeAgentEventPublisher { } public static void publishMaintenanceModeEvent() { - if (!maintenance) { + if (!isMaintenance()) { if (log.isInfoEnabled()) { log.info("Publishing instance maintenance mode event"); } @@ -124,7 +124,7 @@ public class CartridgeAgentEventPublisher { EventPublisher eventPublisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); - maintenance = true; + setMaintenance(true); if (log.isInfoEnabled()) { log.info("Instance Maintenance mode event published"); } @@ -134,5 +134,37 @@ public class CartridgeAgentEventPublisher { } } } + + public static boolean isStarted() { + return started; + } + + public static void setStarted(boolean started) { + CartridgeAgentEventPublisher.started = started; + } + + public static boolean isActivated() { + return activated; + } + + public static void setActivated(boolean activated) { + CartridgeAgentEventPublisher.activated = activated; + } + + public static boolean isReadyToShutdown() { + return readyToShutdown; + } + + public static void setReadyToShutdown(boolean readyToShutdown) { + CartridgeAgentEventPublisher.readyToShutdown = readyToShutdown; + } + + public static boolean isMaintenance() { + return maintenance; + } + + public static void setMaintenance(boolean maintenance) { + CartridgeAgentEventPublisher.maintenance = maintenance; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f6b09d30/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java index 1dae393..e7684a5 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java @@ -22,6 +22,7 @@ package org.apache.stratos.cartridge.agent.statistics.publisher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration; +import org.apache.stratos.cartridge.agent.event.publisher.CartridgeAgentEventPublisher; import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants; import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils; @@ -54,7 +55,8 @@ public class HealthStatisticsNotifier implements Runnable { } if (statsPublisher.isEnabled()) { - if(!CartridgeAgentUtils.checkPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts())) { + if(!CartridgeAgentUtils.checkPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts()) + && !CartridgeAgentEventPublisher.isMaintenance()) { if(log.isInfoEnabled()) { log.info("Publishing ports not open event"); }
