fixes #10

fixes internetitem/logback-elasticsearch-appender#63 fixes internetitem/logback-elasticsearch-appender#86
agido-malter · Jan 10, 2023 · 50a1897 · 50a1897
1 parent ef8ac50
commit 50a1897
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/agido/logback/elasticsearch/AbstractElasticsearchPublisher.java b/src/main/java/com/agido/logback/elasticsearch/AbstractElasticsearchPublisher.java
@@ -206,15 +206,17 @@ private void serializeIndexString(JsonGenerator gen, T event) throws IOException
     }
 
     private void serializeEvent(JsonGenerator gen, T event, List<AbstractPropertyAndEncoder<T>> propertyList) throws IOException {
-        gen.writeStartObject();
+        try {
+            gen.writeStartObject();
 
-        serializeCommonFields(gen, event);
+            serializeCommonFields(gen, event);
 
-        for (AbstractPropertyAndEncoder<T> pae : propertyList) {
-            propertySerializer.serializeProperty(gen, event, pae);
+            for (AbstractPropertyAndEncoder<T> pae : propertyList) {
+                propertySerializer.serializeProperty(gen, event, pae);
+            }
+        } finally {
+            gen.writeEndObject();
         }
-
-        gen.writeEndObject();
     }
 
     protected abstract void serializeCommonFields(JsonGenerator gen, T event) throws IOException;

diff --git a/src/main/java/com/agido/logback/elasticsearch/ClassicElasticsearchPublisher.java b/src/main/java/com/agido/logback/elasticsearch/ClassicElasticsearchPublisher.java
@@ -34,7 +34,7 @@ protected void serializeCommonFields(JsonGenerator gen, ILoggingEvent event) thr
             gen.writeRawValue(event.getFormattedMessage());
         } else {
             String formattedMessage = event.getFormattedMessage();
-            if (settings.getMaxMessageSize() > 0 && formattedMessage.length() > settings.getMaxMessageSize()) {
+            if (settings.getMaxMessageSize() > 0 && formattedMessage != null && formattedMessage.length() > settings.getMaxMessageSize()) {
                 formattedMessage = formattedMessage.substring(0, settings.getMaxMessageSize()) + "..";
             }
             gen.writeObjectField("message", formattedMessage);