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

Wizard: More test results

Browse Source
This commit is contained in:
zzz
2018-11-15 15:07:17 +00:00
parent dc343b05a2
commit 62c712c462
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/routerconsole/java/src/com/vuze/plugins/mlab/MLabRunner.java
View File

@ -148,6 +148,8 @@ public class MLabRunner {
// The other option, discouraged, is to continue using donar which should still be resolving. It just uses ns.measurementlab.net on the backend now. However, this is currently down according to my tests, so we'll work on getting this back as soon as possible.
String server_host = null;
String server_city = null;
String server_country = null;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
@ -178,6 +180,8 @@ public class MLabRunner {
throw new IOException("no url");
}
server_host = url.getHost();
server_city = (String) map.get("city");
server_country = (String) map.get("country");
// ignore the returned port in the URL (7123) which is the applet, not the control port
if (_log.shouldWarn())
_log.warn("Selected server: " + server_host);
@ -230,8 +234,8 @@ public class MLabRunner {
result_str = "No results were received. Either the test server is unavailable or network problems are preventing the test from running correctly. Please try again.";
} else {
result_str =
"Completed: up=" + DataHelper.formatSize(up_bps) +
", down=" + DataHelper.formatSize(down_bps);
"Completed: up=" + DataHelper.formatSize2Decimal(up_bps, false) +
", down=" + DataHelper.formatSize2Decimal(down_bps, false);
}
_log.warn(result_str);
@ -242,6 +246,11 @@ public class MLabRunner {
Map<String,Object> results = new HashMap<String, Object>();
results.put("up", up_bps);
results.put("down", down_bps);
results.put("server_host", server_host);
if (server_city != null)
results.put("server_city", server_city);
if (server_country != null)
results.put("server_country", server_country);
listener.complete( results );
}
if (_log.shouldWarn()) {

33
apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHelper.java
View File

@ -58,7 +58,7 @@ public class WizardHelper extends HelperBase {
if (_listener != null) {
String s = _listener.getSummary();
if (s != null)
s = DataHelper.escapeHTML(s);
rv = DataHelper.escapeHTML(s);
}
return rv;
}
@ -71,7 +71,7 @@ public class WizardHelper extends HelperBase {
if (_listener != null) {
String s = _listener.getDetail();
if (s != null)
s = DataHelper.escapeHTML(s);
rv = DataHelper.escapeHTML(s);
}
return rv;
}
@ -90,7 +90,24 @@ public class WizardHelper extends HelperBase {
return getLongResult("down");
}
public synchronized long getLongResult(String key) {
/**
* @return HTML-escaped location or ""
*/
public String getServerLocation() {
StringBuilder buf = new StringBuilder(64);
String s = getStringResult("server_city");
if (s != null)
buf.append(s).append(' ');
s = getStringResult("server_country");
if (s != null)
buf.append(s).append(' ');
s = getStringResult("server_host");
if (s != null)
buf.append(s);
return DataHelper.escapeHTML(buf.toString());
}
private synchronized long getLongResult(String key) {
if (_listener != null) {
Map<String, Object> results = _listener.getResults();
if (results != null) {
@ -102,6 +119,16 @@ public class WizardHelper extends HelperBase {
return 0;
}
private synchronized String getStringResult(String key) {
if (_listener != null) {
Map<String, Object> results = _listener.getResults();
if (results != null) {
return (String) results.get(key);
}
}
return null;
}
/**
* Start the test. Called from the Handler.
* @return success

1
apps/routerconsole/jsp/welcome.jsp
View File

@ -157,6 +157,7 @@
<table class="configtable">
<tr><td><%=intl._t("Test running?")%></td><td><%=wizhelper.isNDTRunning()%></td></tr>
<tr><td><%=intl._t("Test complete?")%></td><td><%=wizhelper.isNDTComplete()%></td></tr>
<tr><td><%=intl._t("Test server location")%></td><td><%=wizhelper.getServerLocation()%></td></tr>
<tr><td><%=intl._t("Completion status")%></td><td><%=wizhelper.getCompletionStatus()%></td></tr>
<tr><td><%=intl._t("Details")%></td><td><%=wizhelper.getDetailStatus()%></td></tr>
<tr><td><%=intl._t("Upstream Bandwidth")%></td><td><%=net.i2p.data.DataHelper.formatSize2Decimal(wizhelper.getUpBandwidth())%>Bps</td></tr>