Merge pull request #52 from wsalembi/exponentialdelay_millis

fix second/millis confusion

Author: komamitsu

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

@@ -7,7 +7,7 @@
 import java.util.LinkedList;
 
 /**
- * Calculate exponential delay for reconnecting
+ * Handles constant delay for reconnecting. The default delay is 50 ms.
  */
 public class ConstantDelayReconnector implements Reconnector {
     private static final Logger LOG = LoggerFactory.getLogger(ConstantDelayReconnector.class);

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

@@ -1,20 +1,18 @@
 package org.fluentd.logger.sender;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.LinkedList;
 
 /**
- * Calcurate exponential delay for reconnecting
+ * Calculates exponential delay for reconnecting. The start delay is 50ms and exponentially grows to max 60 seconds in
+ * function of the number of connection errors.
  */
 public class ExponentialDelayReconnector implements Reconnector {
 
-    private double wait = 0.5;
+    private double waitMillis = 50; // Start wait is 50ms
 
     private double waitIncrRate = 1.5;
 
-    private double waitMax = 60;
+    private double waitMaxMillis = 60 * 1000; // Max wait is 1 minute
 
     private int waitMaxCount;
 
@@ -26,7 +24,7 @@ public ExponentialDelayReconnector() {
     }
 
     private int getWaitMaxCount() {
-        double r = waitMax / wait;
+        double r = waitMaxMillis / waitMillis;
         for (int j = 1; j <= 100; j++) {
             if (r < waitIncrRate) {
                 return j + 1;
@@ -57,13 +55,13 @@ public boolean enableReconnection(long timestamp) {
             return true;
         }
 
-        double suppressSec;
+        double suppressMillis;
         if (size < waitMaxCount) {
-            suppressSec = wait * Math.pow(waitIncrRate, size - 1);
+            suppressMillis = waitMillis * Math.pow(waitIncrRate, size - 1);
         } else {
-            suppressSec = waitMax;
+            suppressMillis = waitMaxMillis;
         }
 
-        return (!(timestamp - errorHistory.getLast() < suppressSec));
+        return (timestamp - errorHistory.getLast()) >= suppressMillis;
     }
 }