Changeset cfc0664


Ignore:
Timestamp:
Sep 19, 2015 7:06:07 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
02a0ef3
Parents:
2a3b55f
Message:

Don't try to fetch subscriptions, news, or plugin updates while in VM Comm system

Location:
apps
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java

    r2a3b55f rcfc0664  
    7777        Subscription sub = this.subIterator.next();
    7878        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
    79             I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0) {
     79            I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
     80            !I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
    8081            //System.err.println("Fetching addressbook from " + sub.getLocation());
    8182            return new AddressBook(sub, this.proxyHost, this.proxyPort);
  • apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java

    r2a3b55f rcfc0664  
    9898            if (_log.shouldWarn())
    9999                _log.warn("Cannot fetch news - HTTP client tunnel not running");
     100            return;
     101        }
     102        if (shouldProxy && _context.commSystem().isDummy()) {
     103            if (_log.shouldWarn())
     104                _log.warn("Cannot fetch news - VM Comm system");
    100105            return;
    101106        }
  • apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java

    r2a3b55f rcfc0664  
    156156                                     " - " +
    157157                                     Messages.getString("HTTP client proxy tunnel must be running", ctx));
     158            return;
     159        }
     160        if (ctx.commSystem().isDummy()) {
     161            mgr.notifyComplete(null, Messages.getString("Plugin update check failed", ctx) +
     162                                     " - " +
     163                                     "VM Comm System");
    158164            return;
    159165        }
Note: See TracChangeset for help on using the changeset viewer.