tiennm99/tjahzi
1
0 Fork 0
mirror of https://github.com/tiennm99/tjahzi.git synced 2026-10-19 04:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re #39: Added tests for logback implementation of draining.

Browse Source
This commit is contained in:
Tomasz Kowalczewski committed 2021-07-28 23:30:07 +02:00
1 parent 97c6c88abc
commit 7a1d153a61
5 files changed
+75 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderReloadTest.java
+3 -2
View File
@@ -16,6 +16,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.io.File;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -55,7 +56,7 @@ class LokiAppenderReloadTest {
.getResource("appender-test-reload-after.xml")
.toURI();
URI uri = new URI("file://" + Paths.get(uriBefore).toFile().getParent() + "/appender-test-reload.xml");
URI uri = new File(Paths.get(uriBefore).toFile().getParent(), "appender-test-reload.xml").toURI();
Files.copy(Paths.get(uriBefore), Paths.get(uri), StandardCopyOption.REPLACE_EXISTING);
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
@@ -104,7 +105,7 @@ class LokiAppenderReloadTest {
hasItems(
hasItems(
hasItems(
containsString("INFO LokiAppenderReloadTest - Test")
containsString("INFO p.t.t.l.LokiAppenderReloadTest - Test")
)
)
)
logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderShutdownTest.java
+3 -3
View File
@@ -58,11 +58,11 @@ class LokiAppenderShutdownTest {
String expectedLogLine = "Test";
long expectedTimestamp = System.currentTimeMillis();
Logger logger = context.getLogger(LokiAppenderReloadTest.class);
Logger logger = context.getLogger(LokiAppenderShutdownTest.class);
// When
logger.info(expectedLogLine);
context.stop();
((LoggerContext) LoggerFactory.getILoggerFactory()).stop();
// Then
RestAssured.port = loki.getFirstMappedPort();
@@ -93,7 +93,7 @@ class LokiAppenderShutdownTest {
hasItems(
hasItems(
hasItems(
containsString("INFO LokiAppenderShutdownTest - Test")
containsString("INFO p.t.t.l.LokiAppenderShutdownTest - Test")
)
)
)
logback-appender/src/test/resources/appender-test-reload-after.xml
+23 -21
View File
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration packages="pl.tkowalcz.tjahzi.log4j2">
<Loggers>
<Root level="OFF">
</Root>
<configuration debug="true">
<appender name="Loki" class="pl.tkowalcz.tjahzi.logback.LokiAppender">
<Logger name="pl.tkowalcz" level="ALL">
<AppenderRef ref="Loki"/>
</Logger>
</Loggers>
<bufferSizeMegabytes>2</bufferSizeMegabytes>
<batchWait>1000</batchWait>
<appenders>
<Loki name="Loki" bufferSizeMegabytes="2" batchWait="1000">
<host>${sys:loki.host}</host>
<port>${sys:loki.port}</port>
<host>${loki.host}</host>
<port>${loki.port}</port>
<ThresholdFilter level="ALL"/>
<PatternLayout>
<Pattern>%X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}</Pattern>
</PatternLayout>
<efficientLayout>
<pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
</efficientLayout>
<Header name="server" value="127.0.0.1"/>
<Label name="server" value="127.0.0.1"/>
</Loki>
</appenders>
<header>
<name>X-Org-Id</name>
<value>Circus</value>
</header>
<label>
<name>server</name>
<value>127.0.0.1</value>
</label>
</appender>
<root level="debug">
<appender-ref ref="Loki"/>
</root>
</configuration>
logback-appender/src/test/resources/appender-test-reload-before.xml
+23 -21
View File
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration monitorInterval="1" packages="pl.tkowalcz.tjahzi.log4j2">
<Loggers>
<Root level="OFF">
</Root>
<configuration debug="true" scan="true" scanPeriod="1 second">
<appender name="Loki" class="pl.tkowalcz.tjahzi.logback.LokiAppender">
<Logger name="pl.tkowalcz" level="ALL">
<AppenderRef ref="Loki"/>
</Logger>
</Loggers>
<bufferSizeMegabytes>2</bufferSizeMegabytes>
<batchWait>1000</batchWait>
<appenders>
<Loki name="Loki" bufferSizeMegabytes="2" batchWait="1000">
<host>${sys:loki.host}</host>
<port>${sys:loki.port}</port>
<host>${loki.host}</host>
<port>${loki.port}</port>
<ThresholdFilter level="ALL"/>
<PatternLayout>
<Pattern>%X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}</Pattern>
</PatternLayout>
<efficientLayout>
<pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
</efficientLayout>
<Header name="server" value="127.0.0.1"/>
<Label name="server" value="127.0.0.1"/>
</Loki>
</appenders>
<header>
<name>X-Org-Id</name>
<value>Circus</value>
</header>
<label>
<name>server</name>
<value>127.0.0.1</value>
</label>
</appender>
<root level="debug">
<appender-ref ref="Loki"/>
</root>
</configuration>
logback-appender/src/test/resources/appender-test-shutdown.xml
+23 -21
View File
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration monitorInterval="1" packages="pl.tkowalcz.tjahzi.log4j2">
<Loggers>
<Root level="OFF">
</Root>
<configuration debug="true">
<appender name="Loki" class="pl.tkowalcz.tjahzi.logback.LokiAppender">
<Logger name="pl.tkowalcz" level="ALL">
<AppenderRef ref="Loki"/>
</Logger>
</Loggers>
<bufferSizeMegabytes>2</bufferSizeMegabytes>
<batchWait>1000</batchWait>
<appenders>
<Loki name="Loki" bufferSizeMegabytes="2" batchWait="1000">
<host>${sys:loki.host}</host>
<port>${sys:loki.port}</port>
<host>${loki.host}</host>
<port>${loki.port}</port>
<ThresholdFilter level="ALL"/>
<PatternLayout>
<Pattern>%X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}</Pattern>
</PatternLayout>
<efficientLayout>
<pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
</efficientLayout>
<Header name="server" value="127.0.0.1"/>
<Label name="server" value="127.0.0.1"/>
</Loki>
</appenders>
<header>
<name>X-Org-Id</name>
<value>Circus</value>
</header>
<label>
<name>server</name>
<value>127.0.0.1</value>
</label>
</appender>
<root level="debug">
<appender-ref ref="Loki"/>
</root>
</configuration>