#105: minor improvements to logging

incodehq · Mar 5, 2019 · b0e9bc8 · b0e9bc8
1 parent 0eeb659
commit b0e9bc8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/...les/lib/minio/impl/common/src/main/java/org/incode/module/minio/common/util/TryCatch.java b/...les/lib/minio/impl/common/src/main/java/org/incode/module/minio/common/util/TryCatch.java
@@ -13,19 +13,29 @@ public class TryCatch {
     private static final Logger LOG = LoggerFactory.getLogger(TryCatch.class);
 
     public static final int MAX_ATTEMPTS = 5;
+    public static final long SLEEP_MILLIS = 1000L;
 
     public interface Backoff {
         void backoff(int attempt);
 
         class Default implements Backoff {
 
+            private final long sleepMillis;
+
+            public Default() {
+                this(SLEEP_MILLIS);
+            }
+
+            public Default(final long sleepMillis) {
+                this.sleepMillis = sleepMillis;
+            }
             @Override
             public void backoff(final int attempt) {
-                sleep(attempt * 1000L);
+                sleep(attempt * sleepMillis);
             }
 
             /**
-             * protected for convenience of any subclass.
+             * for convenience of any subclass.
              */
             protected static void sleep(final long sleepForMillis) {
                 final long t1 = System.currentTimeMillis() + sleepForMillis;
@@ -42,7 +52,7 @@ protected static void sleep(final long sleepForMillis) {
 
             @Override
             public String toString() {
-                return "default backoff (1s, 2s, 3s, 4s, 5s)";
+                return "backoff for (attempt x " + sleepMillis + ") ms";
             }
         }
     }

diff --git a/...impl/minioclient/src/main/java/org/incode/module/minio/minioclient/MinioUploadClient.java b/...impl/minioclient/src/main/java/org/incode/module/minio/minioclient/MinioUploadClient.java
@@ -117,16 +117,10 @@ public void init() {
         ensureSet(this.bucket, "bucket");
         ensureSet(this.instance, "instance");
 
-        final TryCatch.Backoff backoff = new TryCatch.Backoff.Default() {
-            @Override
-            public void backoff(final int attempt) {
-                sleep(attempt * backoffSleepMillis);
-            }
-        };
+        final TryCatch.Backoff backoff = new TryCatch.Backoff.Default(backoffSleepMillis);
 
         tryCatch = new TryCatch(backoffNumAttempts, backoff) {
-            @Override
-            protected Logger getLog() { return LOG; }
+            @Override protected Logger getLog() { return LOG; }
         };
 
         minioClient = newMinioClient();

diff --git a/...downloader/src/main/java/org/incode/module/minio/miniodownloader/MinioDownloadClient.java b/...downloader/src/main/java/org/incode/module/minio/miniodownloader/MinioDownloadClient.java
@@ -85,16 +85,10 @@ public void init() {
         ensureSet(this.accessKey, "accessKey");
         ensureSet(this.secretKey, "secretKey");
 
-        final TryCatch.Backoff backoff = new TryCatch.Backoff.Default() {
-            @Override
-            public void backoff(final int attempt) {
-                sleep(attempt * backoffSleepMillis);
-            }
-        };
+        final TryCatch.Backoff backoff = new TryCatch.Backoff.Default(backoffSleepMillis);
 
         tryCatch = new TryCatch(backoffNumAttempts, backoff) {
-            @Override
-            protected Logger getLog() { return LOG; }
+            @Override protected Logger getLog() { return LOG; }
         };
         minioClient = newMinioClient();
     }
@@ -109,10 +103,9 @@ private static void ensureSet(final String field, final String fieldName) {
         }
     }
 
-
     /**
      * @param url
-     * @throws if url cannot be parsed to extract bucketName and objectName
+     * @throws RuntimeException if url cannot be parsed to extract bucketName and objectName
      */
     public void check(final String url) {
         ParsedUrl.of(url);