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

fixups after prop

Browse Source
This commit is contained in:
zzz
2012-08-03 18:56:53 +00:00
parent 4a1b83961d
commit 72ed1bc1ac
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@ -923,7 +923,7 @@ public class ConsoleUpdateManager implements UpdateManager {
private void finishStatus(String msg) { private void finishStatus(String msg) {
updateStatus(msg); updateStatus(msg);
SimpleScheduler.getInstance().addEvent(new Cleaner(msg), 20*60*1000); _context.simpleScheduler().addEvent(new Cleaner(msg), 20*60*1000);
} }
private class Cleaner implements SimpleTimer.TimedEvent { private class Cleaner implements SimpleTimer.TimedEvent {

2
apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateChecker.java
View File

@ -61,7 +61,7 @@ class PluginUpdateChecker extends UpdateRunner {
try { try {
_get = new PartialEepGet(_context, proxyHost, proxyPort, _baos, _currentURI.toString(), TrustedUpdate.HEADER_BYTES); _get = new PartialEepGet(_context, proxyHost, proxyPort, _baos, _currentURI.toString(), TrustedUpdate.HEADER_BYTES);
_get.addStatusListener(this); _get.addStatusListener(this);
_get.fetch(); _get.fetch(CONNECT_TIMEOUT);
} catch (Throwable t) { } catch (Throwable t) {
_log.error("Error checking update for plugin", t); _log.error("Error checking update for plugin", t);
} }

2
apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
View File

@ -105,7 +105,7 @@ class PluginUpdateRunner extends UpdateRunner {
else else
_get = new EepGet(_context, 1, _updateFile, _xpi2pURL, false); _get = new EepGet(_context, 1, _updateFile, _xpi2pURL, false);
_get.addStatusListener(PluginUpdateRunner.this); _get.addStatusListener(PluginUpdateRunner.this);
_get.fetch(); _get.fetch(CONNECT_TIMEOUT, -1, shouldProxy ? INACTIVITY_TIMEOUT : NOPROXY_INACTIVITY_TIMEOUT);
} catch (Throwable t) { } catch (Throwable t) {
_log.error("Error downloading plugin", t); _log.error("Error downloading plugin", t);
} }

8
apps/routerconsole/java/src/net/i2p/router/update/UpdateRunner.java
View File

@ -45,6 +45,10 @@ class UpdateRunner extends I2PAppThread implements UpdateTask, EepGet.StatusList
private static final String SIGNED_UPDATE_FILE = "i2pupdate.sud"; private static final String SIGNED_UPDATE_FILE = "i2pupdate.sud";
protected static final long CONNECT_TIMEOUT = 55*1000;
protected static final long INACTIVITY_TIMEOUT = 5*60*1000;
protected static final long NOPROXY_INACTIVITY_TIMEOUT = 60*1000;
public UpdateRunner(RouterContext ctx, List<URI> uris) { public UpdateRunner(RouterContext ctx, List<URI> uris) {
super("Update Runner"); super("Update Runner");
setDaemon(true); setDaemon(true);
@ -127,7 +131,7 @@ class UpdateRunner extends I2PAppThread implements UpdateTask, EepGet.StatusList
// no retries // no retries
_get = new PartialEepGet(_context, proxyHost, proxyPort, baos, updateURL, TrustedUpdate.HEADER_BYTES); _get = new PartialEepGet(_context, proxyHost, proxyPort, baos, updateURL, TrustedUpdate.HEADER_BYTES);
_get.addStatusListener(UpdateRunner.this); _get.addStatusListener(UpdateRunner.this);
_get.fetch(); _get.fetch(CONNECT_TIMEOUT);
} catch (Throwable t) { } catch (Throwable t) {
} }
_isPartial = false; _isPartial = false;
@ -143,7 +147,7 @@ class UpdateRunner extends I2PAppThread implements UpdateTask, EepGet.StatusList
else else
_get = new EepGet(_context, 1, _updateFile, updateURL, false); _get = new EepGet(_context, 1, _updateFile, updateURL, false);
_get.addStatusListener(UpdateRunner.this); _get.addStatusListener(UpdateRunner.this);
_get.fetch(); _get.fetch(CONNECT_TIMEOUT, -1, shouldProxy ? INACTIVITY_TIMEOUT : NOPROXY_INACTIVITY_TIMEOUT);
} catch (Throwable t) { } catch (Throwable t) {
_log.error("Error updating", t); _log.error("Error updating", t);
} }