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

add the other getProperty(); more tweaks

Browse Source
This commit is contained in:
zzz
2012-10-18 21:07:36 +00:00
parent 0b4401e64b
commit 4f936f958d
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,7 +1097,7 @@ public class ConsoleUpdateManager implements UpdateManager {
@Override
public String toString() {
return "RegisteredUpdater " + updater + " for " + type + ' ' + method + " @pri " + priority;
return "RegisteredUpdater " + updater.getClass().getSimpleName() + " for " + type + ' ' + method + " @pri " + priority;
}
}
@ -1138,7 +1138,7 @@ public class ConsoleUpdateManager implements UpdateManager {
@Override
public String toString() {
return "RegisteredChecker " + checker + " for " + type + ' ' + method + " @pri " + priority;
return "RegisteredChecker " + checker.getClass().getSimpleName() + " for " + type + ' ' + method + " @pri " + priority;
}
}

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

@ -97,15 +97,10 @@ class NewsFetcher extends UpdateRunner {
else
get = new EepGet(_context, false, null, 0, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified);
get.addStatusListener(this);
long start = _context.clock().now();
if (get.fetch()) {
String lastMod = get.getLastModified();
if (lastMod != null) {
_lastModified = lastMod;
long lm = RFC822Date.parse822Date(lastMod);
if (lm == 0)
lm = _context.clock().now();
_context.router().saveConfig(NewsHelper.PROP_LAST_CHECKED, Long.toString(lm));
}
_context.router().saveConfig(NewsHelper.PROP_LAST_CHECKED,
Long.toString(start));
return;
}
} catch (Throwable t) {

3
core/java/src/net/i2p/update/UpdateType.java
View File

@ -13,5 +13,6 @@ public enum UpdateType {
ROUTER_UNSIGNED,
PLUGIN, PLUGIN_INSTALL,
GEOIP, BLOCKLIST, RESEED,
HOMEPAGE
HOMEPAGE,
ADDRESSBOOK
}

19
router/java/src/net/i2p/router/RouterContext.java
View File

@ -416,6 +416,25 @@ public class RouterContext extends I2PAppContext {
return super.getProperty(propName, defaultVal);
}
/**
* Return a long with a long default
* @since 0.9.4
*/
@Override
public long getProperty(String propName, long defaultVal) {
if (_router != null) {
String val = _router.getConfigSetting(propName);
if (val != null) {
long rv = defaultVal;
try {
rv = Long.parseLong(val);
} catch (NumberFormatException nfe) {}
return rv;
}
}
return super.getProperty(propName, defaultVal);
}
/**
* @return new Properties with system and context properties
* @since 0.8.4