Wait 2 secondes before closing MockFluentd. Wait 5 seconds before closing MockFluentd if some worker threads are still running

Author: xerial

src/test/java/org/fluentd/logger/TestFluentLogger.java

@@ -87,6 +87,7 @@ public void process(MessagePack msgpack, Socket socket) throws IOException {
 
         // close loggers
         logger.close();
+        Thread.sleep(2000);
 
         // close mock fluentd
         fluentd.close();
@@ -169,6 +170,7 @@ public void process(MessagePack msgpack, Socket socket) throws IOException {
 
         // close loggers
         FluentLogger.closeAll();
+        Thread.sleep(2000);
 
         // close mock fluentd
         fluentd.close();

src/test/java/org/fluentd/logger/util/MockFluentd.java

@@ -146,9 +146,12 @@ public void close() throws IOException {
         try {
             // We need to wait until all log writing threads are finished.
             int numTrial = 0;
-            while(numTrial < 3 && !service.awaitTermination(1, TimeUnit.SECONDS)) {
+            final int maxTrial = 5;
+            while(numTrial < 5 && !service.awaitTermination(1, TimeUnit.SECONDS)) {
                 numTrial++;
             }
+            if(numTrial >= maxTrial)
+                _logger.error("Timed out");
         }
         catch(InterruptedException e) {
             _logger.error("interrupted", e);