Merge 97c999a into a9e82ba

komamitsu · Apr 17, 2019 · 6d63a1a · 6d63a1a
2 parents a9e82ba + 97c999a
commit 6d63a1a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/fluency-core/src/main/java/org/komamitsu/fluency/flusher/Flusher.java b/fluency-core/src/main/java/org/komamitsu/fluency/flusher/Flusher.java
@@ -43,7 +43,11 @@ public class Flusher
     private final AtomicBoolean isTerminated = new AtomicBoolean();
     private final Config config;
     private final BlockingQueue<Boolean> eventQueue = new LinkedBlockingQueue<>();
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor(r -> {
+        Thread t = Executors.defaultThreadFactory().newThread(r);
+        t.setDaemon(true);
+        return t;
+    });
 
     public Flusher(Config config, Buffer buffer, Ingester ingester)
     {

diff --git a/...cy-fluentd/src/main/java/org/komamitsu/fluency/fluentd/ingester/sender/NetworkSender.java b/...cy-fluentd/src/main/java/org/komamitsu/fluency/fluentd/ingester/sender/NetworkSender.java
@@ -44,7 +44,12 @@ public abstract class NetworkSender<T>
     private static final Logger LOG = LoggerFactory.getLogger(NetworkSender.class);
     private static final Charset CHARSET_FOR_ERRORLOG = Charset.forName("UTF-8");
     private final byte[] optionBuffer = new byte[256];
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor(r -> {
+        Thread t = Executors.defaultThreadFactory().newThread(r);
+        t.setDaemon(true);
+        return t;
+    });
+
     private final Config config;
     private final FailureDetector failureDetector;
     private final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());

diff --git a/...td/src/main/java/org/komamitsu/fluency/fluentd/ingester/sender/heartbeat/Heartbeater.java b/...td/src/main/java/org/komamitsu/fluency/fluentd/ingester/sender/heartbeat/Heartbeater.java
@@ -40,7 +40,11 @@ public abstract class Heartbeater
     protected Heartbeater(Config config)
     {
         this.config = config;
-        executorService = Executors.newScheduledThreadPool(1);
+        executorService = Executors.newScheduledThreadPool(1, r -> {
+            Thread t = Executors.defaultThreadFactory().newThread(r);
+            t.setDaemon(true);
+            return t;
+        });
     }
 
     public void start()