ElectionConfig: configurable Zlg

obsidiandynamics · Apr 21, 2018 · b64ef8c · b64ef8c
1 parent 4c497c1
commit b64ef8c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-HazelQ
+<img src="https://raw.githubusercontent.com/wiki/obsidiandynamics/hazelq/images/hazelq-logo.png" width="90px" alt="logo"/> HazelQ
 ===
 Message streaming over Hazelcast IMDG.
 

diff --git a/elect/src/main/java/com/obsidiandynamics/hazelq/Election.java b/elect/src/main/java/com/obsidiandynamics/hazelq/Election.java
@@ -9,8 +9,6 @@
 import com.obsidiandynamics.zerolog.*;
 
 public final class Election implements Terminable, Joinable {
-  private static final Zlg zlg = Zlg.forDeclaringClass().get();
-
   private final ElectionConfig config;
 
   private final RetryableMap<String, byte[]> leases;
@@ -36,8 +34,8 @@ public Election(ElectionConfig config, IMap<String, byte[]> leases) {
         .withExceptionClass(HazelcastException.class)
         .withAttempts(Integer.MAX_VALUE)
         .withBackoff(100)
-        .withFaultHandler(zlg::w)
-        .withErrorHandler(zlg::e);
+        .withFaultHandler(config.getZlg()::w)
+        .withErrorHandler(config.getZlg()::e);
     this.leases = new RetryableMap<>(retry, leases);
     registry = new Registry();
 
@@ -70,14 +68,14 @@ void scavenge() {
         final Lease existingLease = leaseView.getOrDefault(resource, Lease.vacant());
         if (! existingLease.isCurrent()) {
           if (existingLease.isVacant()) {
-            zlg.d("Lease of %s is vacant", z -> z.arg(resource)); 
+            config.getZlg().d("Lease of %s is vacant", z -> z.arg(resource)); 
           } else {
             scavengeWatcher.onExpire(resource, existingLease.getTenant());
-            zlg.d("Lease of %s by %s expired at %s", 
-                  z -> z
-                  .arg(resource)
-                  .arg(existingLease::getTenant)
-                  .arg(Args.map(existingLease::getExpiry, Lease::formatExpiry)));
+            config.getZlg().d("Lease of %s by %s expired at %s", 
+                              z -> z
+                              .arg(resource)
+                              .arg(existingLease::getTenant)
+                              .arg(Args.map(existingLease::getExpiry, Lease::formatExpiry)));
           }
 
           final UUID nextCandidate = registry.getRandomCandidate(resource);
@@ -92,14 +90,14 @@ void scavenge() {
             }
 
             if (success) {
-              zlg.d("New lease of %s by %s until %s", 
-                    z -> z
-                    .arg(resource)
-                    .arg(nextCandidate)
-                    .arg(Args.map(newLease::getExpiry, Lease::formatExpiry)));
+              config.getZlg().d("New lease of %s by %s until %s", 
+                                z -> z
+                                .arg(resource)
+                                .arg(nextCandidate)
+                                .arg(Args.map(newLease::getExpiry, Lease::formatExpiry)));
               reloadView();
               scavengeWatcher.onAssign(resource, nextCandidate);
-            }
+            } 
           }
         }
       }

diff --git a/elect/src/main/java/com/obsidiandynamics/hazelq/ElectionConfig.java b/elect/src/main/java/com/obsidiandynamics/hazelq/ElectionConfig.java
@@ -1,14 +1,27 @@
 package com.obsidiandynamics.hazelq;
 
 import com.obsidiandynamics.yconf.*;
+import com.obsidiandynamics.zerolog.*;
 
 @Y
 public final class ElectionConfig {
+  @YInject
+  private Zlg zlg = Zlg.forDeclaringClass().get();
+
   @YInject
   private int scavengeIntervalMillis = 100;
 
   @YInject
   private int leaseDurationMillis = 60_000;
+
+  Zlg getZlg() {
+    return zlg;
+  }
+
+  public ElectionConfig withZlg(Zlg zlg) {
+    this.zlg = zlg;
+    return this;
+  }
 
   int getScavengeInterval() {
     return scavengeIntervalMillis;

diff --git a/elect/src/test/java/com/obsidiandynamics/hazelq/ElectionConfigTest.java b/elect/src/test/java/com/obsidiandynamics/hazelq/ElectionConfigTest.java
@@ -5,14 +5,18 @@
 import org.junit.*;
 
 import com.obsidiandynamics.assertion.*;
+import com.obsidiandynamics.zerolog.*;
 
 public final class ElectionConfigTest {
   @Test
   public void testFields() {
+    final Zlg zlg = Zlg.forDeclaringClass().get();
     final ElectionConfig c = new ElectionConfig()
+        .withZlg(zlg)
         .withLeaseDuration(100)
         .withScavengeInterval(200);
 
+    assertEquals(zlg, c.getZlg());
     assertEquals(100, c.getLeaseDuration());
     assertEquals(200, c.getScavengeInterval());
   }