fix GelfHttpAppender initialization (#103)

osiegmar · Apr 13, 2024 · 971f701 · 971f701
1 parent 2df33eb
commit 971f701
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 8 deletions.
diff --git a/src/main/java/de/siegmar/logbackgelf/GelfHttpAppender.java b/src/main/java/de/siegmar/logbackgelf/GelfHttpAppender.java
@@ -94,12 +94,12 @@ public class GelfHttpAppender extends UnsynchronizedAppenderBase<ILoggingEvent>
 
     private Compressor compressor;
 
-    public URI getUri() {
-        return uri;
+    public String getUri() {
+        return uri.toString();
     }
 
-    public void setUri(final URI uri) {
-        this.uri = uri;
+    public void setUri(final String uri) {
+        this.uri = URI.create(uri);
     }
 
     public boolean isInsecure() {

diff --git a/src/test/java/de/siegmar/logbackgelf/GelfHttpAppenderTest.java b/src/test/java/de/siegmar/logbackgelf/GelfHttpAppenderTest.java
@@ -25,8 +25,6 @@
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
 import static org.awaitility.Awaitility.await;
 
-import java.net.URI;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.LoggerFactory;
@@ -98,7 +96,7 @@ private GelfHttpAppender buildAppender(final LoggerContext lc, final GelfEncoder
         final GelfHttpAppender gelfAppender = new GelfHttpAppender();
         gelfAppender.setContext(lc);
         gelfAppender.setName("GELF");
-        gelfAppender.setUri(URI.create(String.format("http://localhost:%d/gelf", WIRE_MOCK.getPort())));
+        gelfAppender.setUri(String.format("http://localhost:%d/gelf", WIRE_MOCK.getPort()));
         gelfAppender.setEncoder(gelfEncoder);
         gelfAppender.start();
         return gelfAppender;

diff --git a/src/test/java/de/siegmar/logbackgelf/XmlConfigurationTest.java b/src/test/java/de/siegmar/logbackgelf/XmlConfigurationTest.java
@@ -46,7 +46,7 @@ void xmlConfiguration(final Path file) throws JoranException {
     }
 
     static Stream<Path> xmlConfiguration() {
-        return Stream.of("udp-config.xml", "tcp-config.xml", "tcp_tls-config.xml")
+        return Stream.of("udp-config.xml", "tcp-config.xml", "tcp_tls-config.xml", "http-config.xml")
             .map(name -> Path.of("src", "test", "resources", name));
     }
 

diff --git a/src/test/resources/http-config.xml b/src/test/resources/http-config.xml
@@ -0,0 +1,37 @@
+<configuration>
+
+    <appender name="GELF" class="de.siegmar.logbackgelf.GelfHttpAppender">
+        <uri>http://localhost/gelf</uri>
+        <insecure>false</insecure>
+        <connectTimeout>15000</connectTimeout>
+        <requestTimeout>5000</requestTimeout>
+        <maxRetries>2</maxRetries>
+        <retryDelay>3000</retryDelay>
+        <compressionMethod>GZIP</compressionMethod>
+        <encoder class="de.siegmar.logbackgelf.GelfEncoder">
+            <originHost>localhost</originHost>
+            <includeRawMessage>false</includeRawMessage>
+            <includeMarker>false</includeMarker>
+            <includeMdcData>true</includeMdcData>
+            <includeCallerData>false</includeCallerData>
+            <includeRootCauseData>false</includeRootCauseData>
+            <includeLevelName>false</includeLevelName>
+            <shortMessageLayout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%m%nopex</pattern>
+            </shortMessageLayout>
+            <fullMessageLayout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%m%n</pattern>
+            </fullMessageLayout>
+            <numbersAsString>false</numbersAsString>
+            <staticField>app_name:backend</staticField>
+            <staticField>os_arch:${os.arch}</staticField>
+            <staticField>os_name:${os.name}</staticField>
+            <staticField>os_version:${os.version}</staticField>
+        </encoder>
+    </appender>
+
+    <root level="debug">
+        <appender-ref ref="GELF" />
+    </root>
+
+</configuration>