You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/08/13 02:46:57 UTC

svn commit: r1157306 - /incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java

Author: esammer
Date: Sat Aug 13 00:46:57 2011
New Revision: 1157306

URL: http://svn.apache.org/viewvc?rev=1157306&view=rev
Log:
- It's now possible to setDesiredState to STOP and immediately unsupervise and have
  LifecycleSupervisor Do The Right Thing(tm).

Modified:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java?rev=1157306&r1=1157305&r2=1157306&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java Sat Aug 13 00:46:57 2011
@@ -166,11 +166,6 @@ public class LifecycleSupervisor impleme
       logger.debug("checking process:{} supervisoree:{}", lifecycleAware,
           supervisoree);
 
-      if (supervisoree.status.discard) {
-        logger.debug("Halting monitoring on {}", supervisoree);
-        return;
-      }
-
       long now = System.currentTimeMillis();
 
       if (supervisoree.status.firstSeen == null) {
@@ -225,7 +220,11 @@ public class LifecycleSupervisor impleme
         }
       }
 
-      monitorService.schedule(this, 3, TimeUnit.SECONDS);
+      if (!supervisoree.status.discard) {
+        monitorService.schedule(this, 3, TimeUnit.SECONDS);
+      } else {
+        logger.debug("Halting monitoring on {}", supervisoree);
+      }
 
       logger.debug("Status check complete");
     }