Changeset e42e04c


Ignore:
Timestamp:
Apr 15, 2019 12:49:07 PM (14 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7ce81db9
Parents:
d32d5b5
Message:

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java

    rd32d5b5 re42e04c  
    221221        if (_context.commSystem().isDummy())
    222222            return new NetworkStateMessage(NetworkState.VMCOMM, "VM Comm System");
    223         if (_context.router().getUptime() > 60*1000 && (!_context.router().gracefulShutdownInProgress()) &&
    224             !_context.clientManager().isAlive())
     223        if (_context.router().getUptime() > 60*1000 &&
     224            !_context.clientManager().isAlive() &&
     225            !_context.router().gracefulShutdownInProgress() &&
     226            !_context.router().isRestarting())
    225227            return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Client Manager I2CP Error - check logs"));  // not a router problem but the user should know
    226228        // Warn based on actual skew from peers, not update status, so if we successfully offset
  • router/java/src/net/i2p/router/Router.java

    rd32d5b5 re42e04c  
    834834
    835835    /**
     836     * @return true if router is RESTARTING (soft restart)
     837     * @since 0.9.40
     838     */
     839    public boolean isRestarting() {
     840        synchronized(_stateLock) {
     841            return _state == State.RESTARTING;
     842        }
     843    }
     844
     845    /**
    836846     *  Only for Restarter, after soft restart is complete.
    837847     *  Not for external use.
Note: See TracChangeset for help on using the changeset viewer.