From 0e53445e9121a6684e21884ee5c47aa2a084f40c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 6 Nov 2010 12:34:53 +0000
Subject: [PATCH] * logs.jsp: Format multiline messages better
---
.../java/src/net/i2p/router/web/LogsHelper.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
index f010be834d..3ccd355c2d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
@@ -44,6 +44,8 @@ public class LogsHelper extends HelperBase {
}
******/
+ private final static String NL = System.getProperty("line.separator");
+
/** formats in reverse order */
private String formatMessages(List<String> msgs) {
if (msgs.isEmpty())
@@ -55,6 +57,11 @@ public class LogsHelper extends HelperBase {
for (int i = msgs.size(); i > 0; i--) {
String msg = msgs.get(i - 1);
msg = msg.replace("&", "&").replace("<", "<").replace(">", ">");
+ // remove last \n that LogRecordFormatter added
+ if (msg.endsWith(NL))
+ msg = msg.substring(0, msg.length() - NL.length());
+ // replace \n so that exception stack traces will format correctly and will paste nicely into pastebin
+ msg = msg.replace("\n", "<br> \n");
buf.append("<li>");
if (colorize) {
String color;
--
GitLab