Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.slf4j.LoggerFactory;
import org.togetherjava.tjbot.logging.LogMarkers;

import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URI;
import java.time.Instant;
import java.util.*;
Expand Down Expand Up @@ -119,8 +121,7 @@ private static LogMessage ofEvent(LogEvent event) {
String authorName = event.getLoggerName();
String title = event.getLevel().name();
int colorDecimal = Objects.requireNonNull(LEVEL_TO_AMBIENT_COLOR.get(event.getLevel()));
String description =
abbreviate(event.getMessage().getFormattedMessage(), MAX_EMBED_DESCRIPTION);
String description = abbreviate(describeLogEvent(event), MAX_EMBED_DESCRIPTION);
Instant timestamp = Instant.ofEpochMilli(event.getInstant().getEpochMillisecond());

WebhookEmbed embed = new WebhookEmbedBuilder()
Expand All @@ -134,6 +135,20 @@ private static LogMessage ofEvent(LogEvent event) {
return new LogMessage(embed, timestamp);
}

private static String describeLogEvent(LogEvent event) {
String logMessage = event.getMessage().getFormattedMessage();

Throwable exception = event.getThrown();
if (exception == null) {
return logMessage;
}

StringWriter exceptionWriter = new StringWriter();
exception.printStackTrace(new PrintWriter(exceptionWriter));

return logMessage + "\n" + exceptionWriter.toString().replace("\t", "> ");
}

private static String abbreviate(String text, int maxLength) {
if (text.length() < maxLength) {
return text;
Expand Down