Fix initial wait of ExponentialDelayReconnector and address unit test failures

Author: komamitsu

src/main/java/org/fluentd/logger/sender/ExponentialDelayReconnector.java

@@ -7,12 +7,12 @@
  * function of the number of connection errors.
  */
 public class ExponentialDelayReconnector implements Reconnector {
+    // Visible for test
+    public static final double WAIT_MILLIS = 500; // Start wait is 500ms
 
-    private double waitMillis = 50; // Start wait is 50ms
+    private static final double WAIT_INCR_RATE = 1.5;
 
-    private double waitIncrRate = 1.5;
-
-    private double waitMaxMillis = 60 * 1000; // Max wait is 1 minute
+    private static final double WAIT_MAX_MILLIS = 60 * 1000; // Max wait is 1 minute
 
     private int waitMaxCount;
 
@@ -24,12 +24,12 @@ public ExponentialDelayReconnector() {
     }
 
     private int getWaitMaxCount() {
-        double r = waitMaxMillis / waitMillis;
+        double r = WAIT_MAX_MILLIS / WAIT_MILLIS;
         for (int j = 1; j <= 100; j++) {
-            if (r < waitIncrRate) {
+            if (r < WAIT_INCR_RATE) {
                 return j + 1;
             }
-            r = r / waitIncrRate;
+            r = r / WAIT_INCR_RATE;
         }
         return 100;
     }
@@ -57,9 +57,9 @@ public boolean enableReconnection(long timestamp) {
 
         double suppressMillis;
         if (size < waitMaxCount) {
-            suppressMillis = waitMillis * Math.pow(waitIncrRate, size - 1);
+            suppressMillis = WAIT_MILLIS * Math.pow(WAIT_INCR_RATE, size - 1);
         } else {
-            suppressMillis = waitMaxMillis;
+            suppressMillis = WAIT_MAX_MILLIS;
         }
 
         return (timestamp - errorHistory.getLast()) >= suppressMillis;

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

@@ -2,9 +2,11 @@
 
 import org.fluentd.logger.errorhandler.ErrorHandler;
 import org.fluentd.logger.sender.Event;
+import org.fluentd.logger.sender.ExponentialDelayReconnector;
 import org.fluentd.logger.sender.NullSender;
 import org.fluentd.logger.sender.Sender;
 import org.fluentd.logger.util.MockFluentd;
+import org.junit.Before;
 import org.junit.Test;
 import org.msgpack.MessagePack;
 import org.msgpack.unpacker.Unpacker;
@@ -47,6 +49,12 @@ public void join() throws InterruptedException {
         }
     }
 
+    @Before
+    public void setUp() {
+        // To remove garbage loggers from org.fluentd.logger.FluentLoggerFactory.loggers...
+        System.gc();
+    }
+
 
     @Test
     public void testNormal01() throws Exception {
@@ -274,7 +282,7 @@ public void handleNetworkError(IOException ex) {
             assertTrue(lastError.get() instanceof IOException);
             lastError.set(null);    // Clear the last error
             assertFalse(logger.isConnected());
-            TimeUnit.MILLISECONDS.sleep(100);
+            TimeUnit.MILLISECONDS.sleep((long) (ExponentialDelayReconnector.WAIT_MILLIS * 1.5));
         }
 
         // the logger shouldn't call the error handler after calling removeErrorHandler()
@@ -311,6 +319,7 @@ public void process(MessagePack msgpack, Socket socket) throws IOException {
         threadManager.submit(fluentd2);
         fluentd2.waitUntilReady();
 
+        TimeUnit.MILLISECONDS.sleep((long) (ExponentialDelayReconnector.WAIT_MILLIS * 1.5));
         {
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("k5", "v5");