diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java index b0aafa7715..603729d2ba 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java @@ -12,22 +12,25 @@ import net.i2p.util.Log; import net.i2p.util.Translate; public class ConfigLoggingHelper extends HelperBase { - public ConfigLoggingHelper() {} public String getLogFilePattern() { return _context.logManager().getBaseLogfilename(); } + public String getRecordPattern() { return new String(_context.logManager().getFormat()); } + public String getDatePattern() { return _context.logManager().getDateFormatPattern(); } + public String getMaxFileSize() { int bytes = _context.logManager().getFileSize(); if (bytes <= 0) return "1.00 MiB"; return DataHelper.formatSize2(bytes, false) + 'B'; } + public String getLogLevelTable() { StringBuilder buf = new StringBuilder(32*1024); Properties limits = _context.logManager().getLimits(); @@ -41,13 +44,8 @@ public class ConfigLoggingHelper extends HelperBase { String level = limits.getProperty(prefix); buf.append(prefix).append('=').append(level).append('\n'); } - buf.append("
\n"); - buf.append("

") - .append(_t("Add additional logging statements above (e.g. {0}).", "net.i2p.router.tunnel=WARN")) - .append("
") - .append(_t("Alternatively, put entries in the file {0} (e.g. {1}).", - "" + new File(_context.getConfigDir(), "logger.config") + "", - "logger.record.net.i2p.router.tunnel=WARN")) + buf.append("
\n

"); + buf.append(_t("Add additional logging statements above (e.g. {0}).", "net.i2p.router.tunnel=WARN")) .append("
") .append(_t("Valid log levels are {0}.", "DEBUG, INFO, WARN, ERROR, CRIT")) .append("

\n"); @@ -72,12 +70,13 @@ public class ConfigLoggingHelper extends HelperBase { private static final String[] levels = { "CRIT", "ERROR", "WARN", "INFO", "DEBUG" }; public String getDefaultLogLevelBox() { + StringBuilder buf = new StringBuilder(128); String cur = _context.logManager().getDefaultLimit(); - return getLogLevelBox("defaultloglevel", cur, false); + getLogLevelBox(buf, "defaultloglevel", cur, false); + return buf.toString(); } - private String getLogLevelBox(String name, String cur, boolean showRemove) { - StringBuilder buf = new StringBuilder(128); + private void getLogLevelBox(StringBuilder buf, String name, String cur, boolean showRemove) { buf.append("\n"); - return buf.toString(); } /** @@ -135,7 +133,7 @@ public class ConfigLoggingHelper extends HelperBase { } buf.append("\n"); - buf.append(getLogLevelBox("newloglevel", "WARN", false)); + getLogLevelBox(buf, "newloglevel", "WARN", false); return buf.toString(); }