Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes https://github.com/osiegmar/logback-gelf/issues/110 #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/main/java/de/siegmar/logbackgelf/GelfEncoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,7 @@ public byte[] encode(final ILoggingEvent event) {
collectAdditionalFields(event)
);

final var sb = gelfMessage.toJSON();

if (appendNewline) {
sb.append(System.lineSeparator());
}

return sb.toString().getBytes(StandardCharsets.UTF_8);
return gelfMessageToJson(gelfMessage);
}

protected GelfMessage buildGelfMessage(final long timestamp, final int logLevel, final String shortMessage,
Expand Down Expand Up @@ -472,6 +466,23 @@ private void addFieldMapperData(final ILoggingEvent event, final Map<String, Obj
}
}


/**
* Allow subclasses to customize the message before it is converted to String.
*
* @param gelfMessage the GELF message to serialize.
* @return the serialized GELF message (in JSON format).
*/
protected byte[] gelfMessageToJson(final GelfMessage gelfMessage) {
final var sb = gelfMessage.toJSON();

if (appendNewline) {
sb.append(System.lineSeparator());
}

return sb.toString().getBytes(StandardCharsets.UTF_8);
}

@SuppressWarnings({"PMD.ReturnEmptyArrayRatherThanNull", "PMD.ReturnEmptyCollectionRatherThanNull"})
@Override
public byte[] footerBytes() {
Expand Down