From 81e419afb5749fec4f23f68ccb6bff02e2175ed4 Mon Sep 17 00:00:00 2001 From: Tomasz Kowalczewski Date: Sat, 31 Jul 2021 00:11:07 +0200 Subject: [PATCH] Re #39: Using shutdown timeout from configuration to pass to Agrona Agent (not exactly ideal but makes more sense than hardcoded value). --- .../main/java/pl/tkowalcz/tjahzi/logback/LokiAppender.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppender.java b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppender.java index 59fc891..b8cb71f 100644 --- a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppender.java +++ b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/LokiAppender.java @@ -13,6 +13,7 @@ import pl.tkowalcz.tjahzi.stats.MutableMonitoringModuleWrapper; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Function; public class LokiAppender extends LokiAppenderConfigurator { @@ -86,7 +87,7 @@ public class LokiAppender extends LokiAppenderConfigurator { Map mdcPropertyMap) { for (int i = 0; i < mdcLogLabels.size(); i++) { String mdcLogLabel = mdcLogLabels.get(i); - + if (mdcPropertyMap.containsKey(mdcLogLabel)) { serializer.appendLabel(mdcLogLabel, mdcPropertyMap.get(mdcLogLabel)); } @@ -121,7 +122,7 @@ public class LokiAppender extends LokiAppenderConfigurator { @Override public void stop() { loggingSystem.close( - 1000, + (int) TimeUnit.SECONDS.toMillis(getShutdownTimeoutSeconds()), thread -> addError("Loki appender was unable to stop thread on shutdown: " + thread) );