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

Console: Improve error message when graphs disabled (ticket #2452)

Browse Source
This commit is contained in:
zzz
2019-04-18 13:17:45 +00:00
parent a8ad30b335
commit ea7ddaf6d5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
View File

@ -19,6 +19,7 @@ import net.i2p.router.web.NavHelper;
import net.i2p.router.web.StatSummarizer; import net.i2p.router.web.StatSummarizer;
import net.i2p.router.web.SummaryListener; import net.i2p.router.web.SummaryListener;
import net.i2p.stat.Rate; import net.i2p.stat.Rate;
import net.i2p.util.SystemVersion;
/** /**
* /graphs.jsp, including form, and /graph.jsp * /graphs.jsp, including form, and /graph.jsp
@ -436,11 +437,17 @@ public class GraphHelper extends FormHandler {
@Override @Override
public String getAllMessages() { public String getAllMessages() {
if (StatSummarizer.isDisabled(_context)) { if (StatSummarizer.isDisabled(_context)) {
addFormError("Graphing not supported with this JVM: " + addFormError("Graphing not supported with this JVM or OS");
System.getProperty("java.vendor") + ' ' + addFormNotice("JVM: " + System.getProperty("java.vendor") + ' ' +
System.getProperty("java.version") + " (" + System.getProperty("java.version") + " (" +
System.getProperty("java.runtime.name") + ' ' + System.getProperty("java.runtime.name") + ' ' +
System.getProperty("java.runtime.version") + ')'); System.getProperty("java.runtime.version") + ')');
addFormNotice("OS: " + System.getProperty("os.name") + ' ' +
System.getProperty("os.arch") + ' ' +
System.getProperty("os.version"));
if (!SystemVersion.isMac() && !SystemVersion.isWindows())
addFormNotice("Installing the fonts-dejavu package and then restarting I2P may resolve the issue");
addFormNotice("Check logs for more information");
if (_context.getProperty(PROP_REFRESH, 0) >= 0) { if (_context.getProperty(PROP_REFRESH, 0) >= 0) {
// force no refresh, save silently // force no refresh, save silently
_context.router().saveConfig(PROP_REFRESH, "-1"); _context.router().saveConfig(PROP_REFRESH, "-1");