Repository: stratos Updated Branches: refs/heads/master 28c24ddb3 -> 369d15b58
removed info log gaurd check Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/369d15b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/369d15b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/369d15b5 Branch: refs/heads/master Commit: 369d15b58193e390fa108d4446610002bd89daad Parents: ce18e63 Author: Akila Perera <[email protected]> Authored: Tue Sep 30 08:19:18 2014 +0530 Committer: Akila Perera <[email protected]> Committed: Tue Sep 30 16:58:51 2014 +0530 ---------------------------------------------------------------------- .../cep/extension/CEPTopologyEventReceiver.java | 16 ++++------------ .../cep/extension/FaultHandlingWindowProcessor.java | 13 +++---------- 2 files changed, 7 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/369d15b5/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/CEPTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/CEPTopologyEventReceiver.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/CEPTopologyEventReceiver.java index 70c5679..3218708 100644 --- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/CEPTopologyEventReceiver.java +++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/CEPTopologyEventReceiver.java @@ -58,9 +58,7 @@ public class CEPTopologyEventReceiver implements Runnable { if (!initialized) { try { TopologyManager.acquireReadLock(); - if (log.isInfoEnabled()) { - log.info("Complete topology event received to fault handling window processor."); - } + log.info("Complete topology event received to fault handling window processor."); CompleteTopologyEvent completeTopologyEvent = (CompleteTopologyEvent) event; initialized = faultHandler.loadTimeStampMapFromTopology(completeTopologyEvent.getTopology()); } catch (Exception e) { @@ -78,10 +76,8 @@ public class CEPTopologyEventReceiver implements Runnable { protected void onEvent(Event event) { MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event; faultHandler.getMemberTimeStampMap().remove(memberTerminatedEvent.getMemberId()); - if (log.isInfoEnabled()){ - log.info("Member [member id] " + memberTerminatedEvent.getMemberId() + + log.info("Member [member id] " + memberTerminatedEvent.getMemberId() + " was removed from the time stamp map."); - } } }); @@ -107,9 +103,7 @@ public class CEPTopologyEventReceiver implements Runnable { } Thread thread = new Thread(topologyEventReceiver); thread.start(); - if (log.isInfoEnabled()) { - log.info("CEP topology receiver thread started"); - } + log.info("CEP topology receiver thread started"); // Keep the thread live until terminated while (!terminated) { @@ -118,9 +112,7 @@ public class CEPTopologyEventReceiver implements Runnable { } catch (InterruptedException ignore) { } } - if (log.isInfoEnabled()) { - log.info("CEP topology receiver thread terminated"); - } + log.info("CEP topology receiver thread terminated"); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/369d15b5/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java index 3414b8a..b1830d8 100644 --- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java +++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java @@ -155,9 +155,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run } } - if (log.isInfoEnabled()){ - log.info("Member time stamp map was successfully loaded from the topology."); - } + log.info("Member time stamp map was successfully loaded from the topology."); if (log.isDebugEnabled()){ log.debug("Member TimeStamp Map: " + memberTimeStampMap); } @@ -200,9 +198,8 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run " does not exist in topology"); return; } - if (log.isInfoEnabled()){ - log.info("Publishing member fault event for [member-id] " + memberId); - } + log.info("Publishing member fault event for [member-id] " + memberId); + MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getMemberId(), member.getPartitionId(), 0); memberFaultEventMessageMap.put("message", memberFaultEvent); @@ -272,13 +269,9 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run Thread topologyTopicSubscriberThread = new Thread(cepTopologyEventReceiver); topologyTopicSubscriberThread.start(); - if (log.isDebugEnabled()) { - log.debug("CEP topology receiver thread started"); - } //Ordinary scheduling window.schedule(); - if (log.isDebugEnabled()){ log.debug("Fault handling window processor initialized with [timeToKeep] " + timeToKeep + ", [memberIdAttrName] " + memberIdAttrName + ", [memberIdAttrIndex] " + memberIdAttrIndex +
