Author: nextgens
Date: 2008-07-18 13:50:36 +0000 (Fri, 18 Jul 2008)
New Revision: 21208
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeStats.java
Log:
Remove some backward compat kludge (to read old throttle files)
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-07-18 12:38:24 UTC (rev
21207)
+++ trunk/freenet/src/freenet/node/Node.java 2008-07-18 13:50:36 UTC (rev
21208)
@@ -1568,25 +1568,9 @@
this.storeEnvironment = null;
}
- // FIXME back compatibility
- SimpleFieldSet oldThrottleFS = null;
- File oldThrottle = new File("throttle.dat");
- String oldThrottleName =
nodeConfig.getRawOption("throttleFile");
- if(oldThrottleName != null)
- oldThrottle = new File(oldThrottleName);
- if(oldThrottle.exists() && (!new
File("node-throttle.dat").exists()) && lastVersion < 1021) {
- // Migrate from old throttle file to new node- and
client- throttle files
- try {
- oldThrottleFS = SimpleFieldSet.readFrom(new
File("throttle.dat"), false, true);
- } catch (IOException e) {
- // Ignore
- }
- oldThrottle.delete();
- }
+ nodeStats = new NodeStats(this, sortOrder, new
SubConfig("node.load", config), obwLimit, ibwLimit, nodeDir);
- nodeStats = new NodeStats(this, sortOrder, new
SubConfig("node.load", config), oldThrottleFS, obwLimit, ibwLimit, nodeDir);
-
- clientCore = new NodeClientCore(this, config, nodeConfig,
nodeDir, getDarknetPortNumber(), sortOrder, oldThrottleFS == null ? null :
oldThrottleFS.subset("RequestStarters"), oldConfig, fproxyConfig, toadlets);
+ clientCore = new NodeClientCore(this, config, nodeConfig,
nodeDir, getDarknetPortNumber(), sortOrder, oldConfig, fproxyConfig, toadlets);
netid = new NetworkIDManager(this);
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-07-18 12:38:24 UTC
(rev 21207)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-07-18 13:50:36 UTC
(rev 21208)
@@ -117,7 +117,7 @@
private UserAlert startingUpAlert;
- NodeClientCore(Node node, Config config, SubConfig nodeConfig, File
nodeDir, int portNumber, int sortOrder, SimpleFieldSet oldThrottleFS,
SimpleFieldSet oldConfig, SubConfig fproxyConfig, SimpleToadletServer toadlets)
throws NodeInitException {
+ NodeClientCore(Node node, Config config, SubConfig nodeConfig, File
nodeDir, int portNumber, int sortOrder, SimpleFieldSet oldConfig, SubConfig
fproxyConfig, SimpleToadletServer toadlets) throws NodeInitException {
this.node = node;
this.nodeStats = node.nodeStats;
this.random = node.random;
@@ -140,10 +140,6 @@
"NodeClientCore.fileForClientStats",
"NodeClientCore.fileForClientStatsLong", node.ps, nodeDir);
SimpleFieldSet throttleFS = persister.read();
-
- if(throttleFS == null)
- throttleFS = oldThrottleFS;
-
if(logMINOR) Logger.minor(this, "Read
throttleFS:\n"+throttleFS);
if(logMINOR) Logger.minor(this, "Serializing
RequestStarterGroup from:\n"+throttleFS);
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2008-07-18 12:38:24 UTC
(rev 21207)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2008-07-18 13:50:36 UTC
(rev 21208)
@@ -178,7 +178,7 @@
/** PeerManagerUserAlert stats update interval (milliseconds) */
private static final long peerManagerUserAlertStatsUpdateInterval =
1000; // 1 second
- NodeStats(Node node, int sortOrder, SubConfig statsConfig,
SimpleFieldSet oldThrottleFS, int obwLimit, int ibwLimit, File nodeDir) throws
NodeInitException {
+ NodeStats(Node node, int sortOrder, SubConfig statsConfig, int
obwLimit, int ibwLimit, File nodeDir) throws NodeInitException {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.node = node;
this.peers = node.peers;
@@ -269,10 +269,6 @@
"NodeStat.statsPersister",
"NodeStat.statsPersisterLong", node.ps, nodeDir);
SimpleFieldSet throttleFS = persister.read();
-
- if(throttleFS == null)
- throttleFS = oldThrottleFS;
-
if(logMINOR) Logger.minor(this, "Read
throttleFS:\n"+throttleFS);
// Guesstimates. Hopefully well over the reality.
