You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/04/15 06:27:13 UTC
svn commit: r1587402 -
/incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
Author: olamy
Date: Tue Apr 15 04:27:12 2014
New Revision: 1587402
URL: http://svn.apache.org/r1587402
Log:
shutdown disruptor
Modified:
incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
Modified: incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java?rev=1587402&r1=1587401&r2=1587402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java (original)
+++ incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java Tue Apr 15 04:27:12 2014
@@ -24,6 +24,7 @@ import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.EventTranslator;
import com.lmax.disruptor.RingBuffer;
+import com.lmax.disruptor.TimeoutException;
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.dsl.ProducerType;
import org.apache.sirona.Role;
@@ -262,6 +263,15 @@ public class Collector extends HttpServl
if (collectionFuture != null) {
collectionFuture.done();
}
+ if (this.disruptor != null) {
+ // FIXME make timeout configurable?
+ try
+ {
+ disruptor.shutdown( 1000, TimeUnit.MILLISECONDS );
+ } catch ( TimeoutException e ) {
+ e.printStackTrace();
+ }
+ }
}
@Override