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

- Remove UTC time from summary bar

Browse Source 
- Increase skew warning threshold to 3s (was 100ms)
This commit is contained in:
zzz
2009-08-03 20:02:28 +00:00
parent 7986f5646e
commit c3af134a5b
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -64,24 +64,15 @@ public class SummaryHelper extends HelperBase {
return DataHelper.formatDuration(router.getUptime());
}
private static final DateFormat _fmt = new java.text.SimpleDateFormat("HH:mm:ss", Locale.UK);
public String getTime() {
private String timeSkew() {
if (_context == null) return "";
String now = null;
synchronized (_fmt) {
now = _fmt.format(new Date(_context.clock().now()));
}
if (!_context.clock().getUpdatedSuccessfully())
return now + " (Unknown skew)";
//if (!_context.clock().getUpdatedSuccessfully())
// return " (Unknown skew)";
long ms = _context.clock().getOffset();
long diff = Math.abs(ms);
if (diff < 100)
return now;
return now + " (" + DataHelper.formatDuration(diff) + " skew)";
if (diff < 3000)
return "";
return " (" + DataHelper.formatDuration(diff) + " skew)";
}
public boolean allowReseed() {
@ -94,6 +85,10 @@ public class SummaryHelper extends HelperBase {
public int getAllPeers() { return Math.max(_context.netDb().getKnownRouters() - 1, 0); }
public String getReachability() {
return reachability() + timeSkew();
}
private String reachability() {
if (_context.router().getUptime() > 60*1000 && (!_context.router().gracefulShutdownInProgress()) &&
!_context.clientManager().isAlive())
return "ERR-Client Manager I2CP Error - check logs"; // not a router problem but the user should know

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

@ -48,7 +48,6 @@
<b>Ident:</b> (<a title="Your router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view</a>)<br />
<b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
<b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
<b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
<b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a>
<%
if (helper.updateAvailable()) {