From 52e2381e09d98a6d81da937052ea829db7ec9783 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Sat, 23 Oct 2021 21:35:19 +0200
Subject: [PATCH] Re #77: Cleanup after debugging and bugfix (incorrect order
 of arguments).

---
 .../tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java  |  2 +-
 .../tjahzi/log4j2/LokiAppenderMonitoringTest.java    | 12 ++++++++----
 .../resources/basic-appender-test-configuration.xml  |  2 --
 .../tkowalcz/tjahzi/logback/LokiAppenderFactory.java |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

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 033e425..6f515fd 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
@@ -144,8 +144,8 @@ public class LokiAppenderBuilder<B extends LokiAppenderBuilder<B>> extends Abstr
                 batchSize,
                 TimeUnit.SECONDS.toMillis(batchWait),
                 bufferSizeBytes,
-                TimeUnit.SECONDS.toMillis(shutdownTimeoutSeconds),
                 logShipperWakeupIntervalMillis,
+                TimeUnit.SECONDS.toMillis(shutdownTimeoutSeconds),
                 isUseOffHeapBuffer()
         );
 
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java
index 93a3ec5..98b637c 100644
--- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java
+++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java
@@ -5,6 +5,7 @@ import com.codahale.metrics.MetricRegistry;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
+import org.awaitility.Durations;
 import org.junit.jupiter.api.Test;
 import pl.tkowalcz.tjahzi.stats.DropwizardMonitoringModule;
 
@@ -45,9 +46,12 @@ class LokiAppenderMonitoringTest {
                 .get("appender.loki.httpConnectAttempts");
         assertThat(connectAttemptsCounter).isNotNull();
 
-        await().untilAsserted(() -> {
-                    assertThat(connectAttemptsCounter.getCount()).isEqualTo(1);
-                }
-        );
+        await()
+                .atMost(Durations.ONE_MINUTE)
+                .pollInterval(Durations.ONE_SECOND)
+                .untilAsserted(() -> {
+                            assertThat(connectAttemptsCounter.getCount()).isEqualTo(1);
+                        }
+                );
     }
 }
diff --git a/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml b/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml
index e254131..09c84d6 100644
--- a/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml
+++ b/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml
@@ -19,8 +19,6 @@
                 <Pattern>[%t] %d{DEFAULT} %5p %c{1} - %m%n%exception{full}</Pattern>
             </PatternLayout>
 
-            <connectTimeoutMillis>100</connectTimeoutMillis>
-
             <Header name="server" value="127.0.0.1"/>
             <Label name="server" value="127.0.0.1"/>
         </Loki>
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 ac7d46d..ce17acb 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
@@ -80,8 +80,8 @@ public class LokiAppenderFactory {
                 configurator.getBatchSize(),
                 TimeUnit.SECONDS.toMillis(configurator.getBatchWait()),
                 bufferSizeBytes,
-                TimeUnit.SECONDS.toMillis(configurator.getShutdownTimeoutSeconds()),
                 configurator.getLogShipperWakeupIntervalMillis(),
+                TimeUnit.SECONDS.toMillis(configurator.getShutdownTimeoutSeconds()),
                 configurator.isUseOffHeapBuffer()
         );
     }