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

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

Browse Source
This commit is contained in:
zzz
2015-09-19 19:06:07 +00:00
parent 2a3b55f3a4
commit cfc0664756
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
View File

@ -76,7 +76,8 @@ class SubscriptionIterator implements Iterator<AddressBook> {
public AddressBook next() { public AddressBook next() {
Subscription sub = this.subIterator.next(); Subscription sub = this.subIterator.next();
if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() && if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0) { I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
!I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
//System.err.println("Fetching addressbook from " + sub.getLocation()); //System.err.println("Fetching addressbook from " + sub.getLocation());
return new AddressBook(sub, this.proxyHost, this.proxyPort); return new AddressBook(sub, this.proxyHost, this.proxyPort);
} else { } else {

5
apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
View File

@ -99,6 +99,11 @@ class NewsFetcher extends UpdateRunner {
_log.warn("Cannot fetch news - HTTP client tunnel not running"); _log.warn("Cannot fetch news - HTTP client tunnel not running");
return; return;
} }
if (shouldProxy && _context.commSystem().isDummy()) {
if (_log.shouldWarn())
_log.warn("Cannot fetch news - VM Comm system");
return;
}
for (URI uri : _urls) { for (URI uri : _urls) {
_currentURI = addLang(uri); _currentURI = addLang(uri);

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

@ -157,6 +157,12 @@ public class PluginStarter implements Runnable {
Messages.getString("HTTP client proxy tunnel must be running", ctx)); Messages.getString("HTTP client proxy tunnel must be running", ctx));
return; return;
} }
if (ctx.commSystem().isDummy()) {
mgr.notifyComplete(null, Messages.getString("Plugin update check failed", ctx) +
" - " +
"VM Comm System");
return;
}
Log log = ctx.logManager().getLog(PluginStarter.class); Log log = ctx.logManager().getLog(PluginStarter.class);
int updated = 0; int updated = 0;