echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* logs.jsp:

Browse Source 
- Don't display dup message if last
   - Spacing tweaks
This commit is contained in:
zzz
2012-10-29 22:10:42 +00:00
parent fd3423fe09
commit 32f3ca0568
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
View File

@ -29,7 +29,7 @@ public class LogsHelper extends HelperBase {
*/ */
public String getLogs() { public String getLogs() {
String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages());
return _("File location") + ": <b><code>" + _context.logManager().currentFile() + "</code></b><br><br>" + str; return "<p>" + _("File location") + ": <b><code>" + _context.logManager().currentFile() + "</code></b></p>" + str;
} }
/** /**
@ -73,10 +73,10 @@ public class LogsHelper extends HelperBase {
File f = wrapperLogFile(_context); File f = wrapperLogFile(_context);
String str = FileUtil.readTextFile(f.getAbsolutePath(), 250, false); String str = FileUtil.readTextFile(f.getAbsolutePath(), 250, false);
if (str == null) if (str == null)
return _("File not found") + ": <b><code>" + f.getAbsolutePath() + "</code></b>"; return "<p>" + _("File not found") + ": <b><code>" + f.getAbsolutePath() + "</code></b></p>";
else { else {
str = str.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;"); str = str.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
return _("File location") + ": <b><code>" + f.getAbsolutePath() + "</code></b> <pre>" + str + "</pre>"; return "<p>" + _("File location") + ": <b><code>" + f.getAbsolutePath() + "</code></b></p><pre>" + str + "</pre>";
} }
} }
@ -97,6 +97,9 @@ public class LogsHelper extends HelperBase {
buf.append("<ul>"); buf.append("<ul>");
for (int i = msgs.size() - 1; i >= 0; i--) { for (int i = msgs.size() - 1; i >= 0; i--) {
String msg = msgs.get(i); String msg = msgs.get(i);
// don't display the dup message if it is last
if (i == 0 && msg.contains("&darr;"))
break;
msg = msg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;"); msg = msg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
msg = msg.replace("&amp;darr;", "&darr;"); // hack - undo the damage (LogWriter) msg = msg.replace("&amp;darr;", "&darr;"); // hack - undo the damage (LogWriter)
// remove last \n that LogRecordFormatter added // remove last \n that LogRecordFormatter added