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

Console: Don't display I2CP error during soft restart (ticket #2468)

Browse Source
This commit is contained in:
zzz
2019-04-15 12:49:07 +00:00
parent d32d5b5f29
commit e42e04c0f0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,8 +220,10 @@ public class SummaryHelper extends HelperBase {
private NetworkStateMessage reachability() { private NetworkStateMessage reachability() {
if (_context.commSystem().isDummy()) if (_context.commSystem().isDummy())
return new NetworkStateMessage(NetworkState.VMCOMM, "VM Comm System"); return new NetworkStateMessage(NetworkState.VMCOMM, "VM Comm System");
if (_context.router().getUptime() > 60*1000 && (!_context.router().gracefulShutdownInProgress()) && if (_context.router().getUptime() > 60*1000 &&
!_context.clientManager().isAlive()) !_context.clientManager().isAlive() &&
!_context.router().gracefulShutdownInProgress() &&
!_context.router().isRestarting())
return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Client Manager I2CP Error - check logs")); // not a router problem but the user should know return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Client Manager I2CP Error - check logs")); // not a router problem but the user should know
// Warn based on actual skew from peers, not update status, so if we successfully offset // Warn based on actual skew from peers, not update status, so if we successfully offset
// the clock, we don't complain. // the clock, we don't complain.

10
router/java/src/net/i2p/router/Router.java
View File

@ -832,6 +832,16 @@ public class Router implements RouterClock.ClockShiftListener {
} }
} }
/**
* @return true if router is RESTARTING (soft restart)
* @since 0.9.40
*/
public boolean isRestarting() {
synchronized(_stateLock) {
return _state == State.RESTARTING;
}
}
/** /**
* Only for Restarter, after soft restart is complete. * Only for Restarter, after soft restart is complete.
* Not for external use. * Not for external use.