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

configlogging code cleanup

Browse Source
This commit is contained in:
zzz
2020-08-01 12:48:53 +00:00
parent e52359c4c0
commit 29d2051a34
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java
View File

@ -12,22 +12,25 @@ import net.i2p.util.Log;
import net.i2p.util.Translate; import net.i2p.util.Translate;
public class ConfigLoggingHelper extends HelperBase { public class ConfigLoggingHelper extends HelperBase {
public ConfigLoggingHelper() {}
public String getLogFilePattern() { public String getLogFilePattern() {
return _context.logManager().getBaseLogfilename(); return _context.logManager().getBaseLogfilename();
} }
public String getRecordPattern() { public String getRecordPattern() {
return new String(_context.logManager().getFormat()); return new String(_context.logManager().getFormat());
} }
public String getDatePattern() { public String getDatePattern() {
return _context.logManager().getDateFormatPattern(); return _context.logManager().getDateFormatPattern();
} }
public String getMaxFileSize() { public String getMaxFileSize() {
int bytes = _context.logManager().getFileSize(); int bytes = _context.logManager().getFileSize();
if (bytes <= 0) return "1.00 MiB"; if (bytes <= 0) return "1.00 MiB";
return DataHelper.formatSize2(bytes, false) + 'B'; return DataHelper.formatSize2(bytes, false) + 'B';
} }
public String getLogLevelTable() { public String getLogLevelTable() {
StringBuilder buf = new StringBuilder(32*1024); StringBuilder buf = new StringBuilder(32*1024);
Properties limits = _context.logManager().getLimits(); Properties limits = _context.logManager().getLimits();
@ -41,13 +44,8 @@ public class ConfigLoggingHelper extends HelperBase {
String level = limits.getProperty(prefix); String level = limits.getProperty(prefix);
buf.append(prefix).append('=').append(level).append('\n'); buf.append(prefix).append('=').append(level).append('\n');
} }
buf.append("</textarea><br>\n"); buf.append("</textarea><br>\n<p>");
buf.append("<p>") buf.append(_t("Add additional logging statements above (e.g. {0}).", "<b>net.i2p.router.tunnel=WARN</b>"))
.append(_t("Add additional logging statements above (e.g. {0}).", "<b>net.i2p.router.tunnel=WARN</b>"))
.append("<br>")
.append(_t("Alternatively, put entries in the file {0} (e.g. {1}).",
"<b>" + new File(_context.getConfigDir(), "logger.config") + "</b>",
"<b>logger.record.net.i2p.router.tunnel=WARN</b>"))
.append("<br>") .append("<br>")
.append(_t("Valid log levels are {0}.", "<b>DEBUG, INFO, WARN, ERROR, CRIT</b>")) .append(_t("Valid log levels are {0}.", "<b>DEBUG, INFO, WARN, ERROR, CRIT</b>"))
.append("</p>\n"); .append("</p>\n");
@ -72,12 +70,13 @@ public class ConfigLoggingHelper extends HelperBase {
private static final String[] levels = { "CRIT", "ERROR", "WARN", "INFO", "DEBUG" }; private static final String[] levels = { "CRIT", "ERROR", "WARN", "INFO", "DEBUG" };
public String getDefaultLogLevelBox() { public String getDefaultLogLevelBox() {
StringBuilder buf = new StringBuilder(128);
String cur = _context.logManager().getDefaultLimit(); 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) { private void getLogLevelBox(StringBuilder buf, String name, String cur, boolean showRemove) {
StringBuilder buf = new StringBuilder(128);
buf.append("<select name=\"").append(name).append("\">\n"); buf.append("<select name=\"").append(name).append("\">\n");
for (int i = 0; i < levels.length; i++) { for (int i = 0; i < levels.length; i++) {
@ -88,10 +87,9 @@ public class ConfigLoggingHelper extends HelperBase {
buf.append('>').append(_c(l)).append("</option>\n"); buf.append('>').append(_c(l)).append("</option>\n");
} }
if (showRemove) //if (showRemove)
buf.append("<option value=\"remove\">").append(_t("Remove")).append("</option>"); // buf.append("<option value=\"remove\">").append(_t("Remove")).append("</option>");
buf.append("</select>\n"); buf.append("</select>\n");
return buf.toString();
} }
/** /**
@ -135,7 +133,7 @@ public class ConfigLoggingHelper extends HelperBase {
} }
buf.append("</select>\n"); buf.append("</select>\n");
buf.append(getLogLevelBox("newloglevel", "WARN", false)); getLogLevelBox(buf, "newloglevel", "WARN", false);
return buf.toString(); return buf.toString();
} }