From bca115eef95b403d0eff18778e8193a808a1e1a2 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Thu, 21 Oct 2021 19:01:12 +0200
Subject: [PATCH] Re #77: Improved property naming (logShipperIntervalMillis ->
 logShipperWakeupIntervalMillis) and implemented missing Logback part.

---
 .../java/pl/tkowalcz/tjahzi/TjahziInitializer.java   |  4 ++--
 .../tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java  | 12 ++++++------
 .../tjahzi/logback/LokiAppenderConfigurator.java     |  9 +++++++++
 .../tkowalcz/tjahzi/logback/LokiAppenderFactory.java |  1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
index 11a2999..d71e1d2 100644
--- a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
@@ -23,7 +23,7 @@ public class TjahziInitializer {
             long batchSizeBytes,
             long batchWaitMillis,
             int bufferSizeBytes,
-            long logShipperIntervalMillis,
+            long logShipperWakeupIntervalMillis,
             long shutdownTimeoutMillis,
             boolean offHeap
     ) {
@@ -54,7 +54,7 @@ public class TjahziInitializer {
         );
 
         AgentRunner runner = new AgentRunner(
-                new SleepingMillisIdleStrategy(logShipperIntervalMillis),
+                new SleepingMillisIdleStrategy(logShipperWakeupIntervalMillis),
                 monitoringModule::addAgentError,
                 null,
                 agent
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
index 8ed1b18..9604e2e 100644
--- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
@@ -75,7 +75,7 @@ public class LokiAppenderBuilder<B extends LokiAppenderBuilder<B>> extends Abstr
     private long batchWait = 5;
 
     @PluginBuilderAttribute
-    private long logShipperIntervalMillis = 250;
+    private long logShipperWakeupIntervalMillis = 250;
 
     @PluginBuilderAttribute
     private int shutdownTimeoutSeconds = 10;
@@ -145,7 +145,7 @@ public class LokiAppenderBuilder<B extends LokiAppenderBuilder<B>> extends Abstr
                 TimeUnit.SECONDS.toMillis(batchWait),
                 bufferSizeBytes,
                 TimeUnit.SECONDS.toMillis(shutdownTimeoutSeconds),
-                logShipperIntervalMillis,
+                logShipperWakeupIntervalMillis,
                 isUseOffHeapBuffer()
         );
 
@@ -251,12 +251,12 @@ public class LokiAppenderBuilder<B extends LokiAppenderBuilder<B>> extends Abstr
         this.batchWait = batchWait;
     }
 
-    public long getLogShipperIntervalMillis() {
-        return logShipperIntervalMillis;
+    public long getLogShipperWakeupIntervalMillis() {
+        return logShipperWakeupIntervalMillis;
     }
 
-    public void setLogShipperIntervalMillis(long logShipperIntervalMillis) {
-        this.logShipperIntervalMillis = logShipperIntervalMillis;
+    public void setLogShipperWakeupIntervalMillis(long logShipperWakeupIntervalMillis) {
+        this.logShipperWakeupIntervalMillis = logShipperWakeupIntervalMillis;
     }
 
     public int getShutdownTimeoutSeconds() {
diff --git a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderConfigurator.java b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderConfigurator.java
index fd276d3..479050c 100644
--- a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderConfigurator.java
+++ b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderConfigurator.java
@@ -26,6 +26,7 @@ public abstract class LokiAppenderConfigurator extends UnsynchronizedAppenderBas
     private long batchSize = 10_2400;
     private long batchWait = 5;
     private long shutdownTimeoutSeconds = 10;
+    private long logShipperWakeupIntervalMillis = 250;
 
     private int maxRequestsInFlight = 100;
 
@@ -120,6 +121,14 @@ public abstract class LokiAppenderConfigurator extends UnsynchronizedAppenderBas
         this.shutdownTimeoutSeconds = shutdownTimeoutSeconds;
     }
 
+    public long getLogShipperWakeupIntervalMillis() {
+        return logShipperWakeupIntervalMillis;
+    }
+
+    public void setLogShipperWakeupIntervalMillis(long logShipperWakeupIntervalMillis) {
+        this.logShipperWakeupIntervalMillis = logShipperWakeupIntervalMillis;
+    }
+
     public int getMaxRequestsInFlight() {
         return maxRequestsInFlight;
     }
diff --git a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderFactory.java b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderFactory.java
index 7fdfd93..ac7d46d 100644
--- a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderFactory.java
+++ b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppenderFactory.java
@@ -81,6 +81,7 @@ public class LokiAppenderFactory {
                 TimeUnit.SECONDS.toMillis(configurator.getBatchWait()),
                 bufferSizeBytes,
                 TimeUnit.SECONDS.toMillis(configurator.getShutdownTimeoutSeconds()),
+                configurator.getLogShipperWakeupIntervalMillis(),
                 configurator.isUseOffHeapBuffer()
         );
     }