Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node
Modified Files:
Node.java StandardMessageHandler.java NodeReference.java
ConnectionOpener.java StateChain.java LoadStats.java
NodeConsole.java IPAddressDetector.java Main.java
NodeConfigUpdater.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: Node.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Node.java,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -w -r1.234 -r1.235
--- Node.java 30 Oct 2003 01:34:02 -0000 1.234
+++ Node.java 31 Oct 2003 19:21:19 -0000 1.235
@@ -2090,7 +2090,7 @@
if(e.getMessage().indexOf("java/nio/channels/spi/AbstractInterruptibleChannel") != -1){
String error = "Your Java installation is too old (insufficient NIO
support). Please update it to 1.4.1 or later; you can do that at http://java.sun.com/
.";
System.err.println(error);
- Core.logger.log(Node.class, error, Core.logger.ERROR);
+ Core.logger.log(Node.class, error, Logger.ERROR);
Main.loggerHook.close();
System.exit(1);
}else
@@ -2104,7 +2104,7 @@
if(storeSize < (101L * (1<<20))) {
String error = "Store size insufficient to store 1MB chunks! Your
datastore is so small that it will not be able to store 1MB chunks, the maximum size
of a single data key that most tools insert. You will still be able to fetch them but
your node will not be very useful to the network, and consequentially will not perform
well. To eliminate this error increase your storeSize to at least 101M. It is
currently "+storeSize+".";
System.err.println(error);
- Core.logger.log(Node.class, error, Core.logger.ERROR);
+ Core.logger.log(Node.class, error, Logger.ERROR);
}
storeBlockSize = params.getInt("storeBlockSize");
storeMaxTempFraction = params.getFloat("storeMaxTempFraction");
@@ -2155,7 +2155,7 @@
" without causing the node identity to"+
" disappear, taking with it all references to"+
" your node from the rest of the network.",
- Core.logger.NORMAL);
+ Logger.NORMAL);
nodeFile = "node_" + listenPort;
}
}
@@ -2173,7 +2173,7 @@
" without causing the datastore to"+
" disappear, causing a major disk space leak"+
" and a significant loss of performance.",
- Core.logger.NORMAL);
+ Logger.NORMAL);
storeFile = new String[] {"store_" + listenPort };
} else {
File idx = new File("store", "index");
@@ -2405,42 +2405,42 @@
}
protected void logDebug(String s, boolean trace) {
- if(Core.logger.shouldLog(Core.logger.DEBUG)) {
+ if(Core.logger.shouldLog(Logger.DEBUG)) {
if(trace)
- Core.logger.log(this, s, Core.logger.DEBUG);
+ Core.logger.log(this, s, Logger.DEBUG);
else
Core.logger.log(this, s, new Exception("debug"),
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
public synchronized void queue(Bucket block, BucketFactory owner, int htl,
String cipher) {
super.queue(block, owner, htl, cipher);
- if(logger.shouldLog(Core.logger.MINOR))
+ if(logger.shouldLog(Logger.MINOR))
logger.log(this, "Queued a background insert at HTL " + htl,
Logger.MINOR);
diagnostics.occurrenceCounting("queuedBackgroundInsert", 1);
}
protected void onRawEvent(freenet.client.ClientEvent e) {
- if(Core.logger.shouldLog(Core.logger.DEBUG)) {
+ if(Core.logger.shouldLog(Logger.DEBUG)) {
Core.logger.log(this, "BI: " + e.getDescription(),
Logger.DEBUG);
}
}
protected void onStart() {
- if(Core.logger.shouldLog(Core.logger.MINOR)) {
+ if(Core.logger.shouldLog(Logger.MINOR)) {
Core.logger.log(this, "BackgroundInserter -- thread started.",
- Core.logger.MINOR);
+ Logger.MINOR);
}
}
protected void onExit() {
- if(Core.logger.shouldLog(Core.logger.MINOR)) {
+ if(Core.logger.shouldLog(Logger.MINOR)) {
Core.logger.log(this, "BackgroundInserter -- thread exited.",
- Core.logger.MINOR);
+ Logger.MINOR);
}
}
}
Index: StandardMessageHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/StandardMessageHandler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- StandardMessageHandler.java 14 Oct 2003 23:17:18 -0000 1.19
+++ StandardMessageHandler.java 31 Oct 2003 19:21:19 -0000 1.20
@@ -3,6 +3,7 @@
import freenet.*;
import freenet.support.*;
+
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.Iterator;
@@ -48,7 +49,7 @@
public boolean handle(MessageObject mo, boolean onlyIfCanRunFast) {
if (!(mo instanceof NodeMessageObject)) {
- node.logger.log(this,
+ Core.logger.log(this,
"Received a MessageObject that
the node cannot handle: "+mo,
Logger.ERROR);
return true;
@@ -261,14 +262,14 @@
private final void lost(Node node) {
if (chain.lost(node)) {
- node.logger.log(node,
+ Core.logger.log(node,
"States overflow,
discarding: "+chain,
Logger.DEBUG);
if (chain.priority() > State.EXPENDABLE) {
- node.logger.log(node,
+ Core.logger.log(node,
"State queue overflow! Event: " + chain +
- "lost.", node.logger.NORMAL);
- node.diagnostics.occurrenceCounting("liveChains", -1);
+ "lost.", Logger.NORMAL);
+ Core.diagnostics.occurrenceCounting("liveChains", -1);
}
}
}
Index: NodeReference.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeReference.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- NodeReference.java 30 Oct 2003 15:27:38 -0000 1.31
+++ NodeReference.java 31 Oct 2003 19:21:19 -0000 1.32
@@ -419,7 +419,7 @@
long endTime = System.currentTimeMillis();
long time = endTime - startTime;
- int logLevel = time>1000 ? Core.logger.NORMAL : Core.logger.DEBUG;
+ int logLevel = time>1000 ? Logger.NORMAL : Logger.DEBUG;
if(Core.logger.shouldLog(logLevel,this))
Core.logger.log(this, "t.getAddress("+physical[i+1]+") took
"+time,logLevel);
return addr;
@@ -545,7 +545,7 @@
r = getAddress((Transport) e.nextElement());
} catch (BadAddressException bae) {
Core.logger.log(this, "BadAddressException in getPeer",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
Index: ConnectionOpener.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ConnectionOpener.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- ConnectionOpener.java 27 Oct 2003 14:45:17 -0000 1.24
+++ ConnectionOpener.java 31 Oct 2003 19:21:19 -0000 1.25
@@ -43,7 +43,7 @@
boolean logDEBUG =
n.logger.shouldLog(Logger.DEBUG,ConnectionOpener.class);
if(logDEBUG)
- n.logger.log(ConnectionOpener.class,
+ Core.logger.log(ConnectionOpener.class,
"Scheduling ConnectionOpener for "+id,
new Exception("debug"), Logger.DEBUG);
if(!needsOpen(id, n.rt, n.connections)) {
@@ -80,12 +80,12 @@
public long nextCheckpoint() {
logDEBUG = node.logger.shouldLog(Logger.DEBUG,this);
if(logDEBUG)
- node.logger.log(this, "nextCheckpoint() on "+this,
+ Core.logger.log(this, "nextCheckpoint() on "+this,
Logger.DEBUG);
boolean rtReferencesMe = needsOpen(id);
if(!rtReferencesMe) {
if(logDEBUG)
- node.logger.log(this, "unscheduling "+this+" (needsOpen: "+
+ Core.logger.log(this, "unscheduling "+this+" (needsOpen: "+
rtReferencesMe+")", Logger.DEBUG);
isUnscheduled = true;
synchronized(connOpeners) {
@@ -94,7 +94,7 @@
return -1;
}
if(logDEBUG)
- node.logger.log(this, "Scheduling in "+currentDelay+
+ Core.logger.log(this, "Scheduling in "+currentDelay+
"ms", Logger.DEBUG);
return System.currentTimeMillis()+currentDelay;
}
@@ -110,7 +110,7 @@
*/
public synchronized void reschedule(boolean aaargh) {
if(logDEBUG)
- node.logger.log(this, "Rescheduling "+this,
+ Core.logger.log(this, "Rescheduling "+this,
new Exception("debug"), Logger.DEBUG);
if(aaargh)
currentDelay = lastBackoffDelay;
@@ -119,16 +119,16 @@
if(isUnscheduled) {
isUnscheduled = false;
if(logDEBUG)
- node.logger.log(this, "Was unscheduled: "+this,
+ Core.logger.log(this, "Was unscheduled: "+this,
Logger.DEBUG);
new Checkpoint(this).schedule(node);
connOpeners.put(id, this);
if(logDEBUG)
- node.logger.log(this, "Rescheduled in "+currentDelay+
+ Core.logger.log(this, "Rescheduled in "+currentDelay+
"ms: "+this, Logger.DEBUG);
} else {
if(logDEBUG)
- node.logger.log(this, "Was already scheduled in "+
+ Core.logger.log(this, "Was already scheduled in "+
currentDelay+"ms: "+this,
Logger.DEBUG); }
}
@@ -148,7 +148,7 @@
logDEBUG = node.logger.shouldLog(Logger.DEBUG,this);
boolean logMINOR = node.logger.shouldLog(Logger.MINOR);
if(logDEBUG)
- node.logger.log(this, "Running checkpoint on "+this,
+ Core.logger.log(this, "Running checkpoint on "+this,
Logger.DEBUG);
if(!needsOpen(id)) return;
NodeReference ref = ocm.getNodeReference(id);
Index: StateChain.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/StateChain.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- StateChain.java 30 Oct 2003 01:34:02 -0000 1.24
+++ StateChain.java 31 Oct 2003 19:21:19 -0000 1.25
@@ -139,7 +139,7 @@
mo.drop(node);
}
catch (Throwable e) {
- node.logger.log(node, "Error dropping message: "+mo,
+ Core.logger.log(node, "Error dropping message: "+mo,
e, Logger.ERROR);
}
}
@@ -152,7 +152,7 @@
state.lost(node);
}
catch (Throwable e) {
- node.logger.log(node, "Error discarding state: "+state,
+ Core.logger.log(node, "Error discarding state: "+state,
e, Logger.ERROR);
}
}
@@ -170,10 +170,10 @@
state = mo.getInitialState();
} catch (BadStateException e) {
drop(node, mo);
- node.logger.log(node, "Bad state on new message: " + mo,
+ Core.logger.log(node, "Bad state on new message: " + mo,
e, Logger.MINOR);
} catch (Throwable e) {
- node.logger.log(node,
+ Core.logger.log(node,
"Error getting initial state for message: "+mo,
e, Logger.ERROR);
}
@@ -194,7 +194,7 @@
Core.logger.log(StateChain.class, "Finished running "+
state+".received("+node+","+mo+")", Logger.DEBUG);
} catch (BadStateException e) {
- node.logger.log(node,
+ Core.logger.log(node,
"Message " + mo + " received during state "
+ state + " was not welcome",
e, Logger.MINOR);
@@ -216,7 +216,7 @@
// we'll treat an abnormal exit the same as a null exit
// (newState is null)
catch (Throwable e) {
- node.logger.log(node,
+ Core.logger.log(node,
"Error while receiving message "+mo+
" in state "+state+": "+e, e, Logger.ERROR);
}
@@ -224,14 +224,14 @@
// null or abnormal exit
if (newState == null) {
if(logDEBUG)
- node.logger.log(node,
+ Core.logger.log(node,
"Ending chain: " + Fields.longToHex(state.id()),
new Exception("debug"), Logger.DEBUG);
}
// normal transition
else if (newState != state) {
if(logDEBUG)
- node.logger.log(StateChain.class,
+ Core.logger.log(StateChain.class,
"Chain " + Fields.longToHex(state.id()) +
" state change: " + state.getName() + " -> " +
newState.getName(), Logger.DEBUG);
Index: LoadStats.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/LoadStats.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- LoadStats.java 30 Oct 2003 01:34:02 -0000 1.38
+++ LoadStats.java 31 Oct 2003 19:21:19 -0000 1.39
@@ -108,8 +108,8 @@
this.times = new long[lsAcceptRatioSamples];
this.timesPos = 0;
this.ratio = lsAcceptRatioSamples; // acceptRatio starts at 1.0.
- this.logDEBUG = Core.logger.shouldLog(Core.logger.DEBUG);
- this.logMINOR = Core.logger.shouldLog(Core.logger.MINOR);
+ this.logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+ this.logMINOR = Core.logger.shouldLog(Logger.MINOR);
{
// Average queries per hour with a half life as specified.
// 3600 * 1000 is an hour in milliseconds.
@@ -603,7 +603,7 @@
if (b && logMINOR)
Core.logger.log(this, "Telling a response to reset DataSource. " +
"Current probability " + resetProbability,
- Core.logger.MINOR);
+ Logger.MINOR);
diag.occurrenceBinomial("resetRatio", 1, b ? 1 : 0);
return b;
@@ -669,7 +669,7 @@
public void checkpoint() {
if (logDEBUG)
Core.logger.log(this, "Executing checkpoint in LoadStats",
- Core.logger.DEBUG);
+ Logger.DEBUG);
synchronized (this) {
this.lastCheckpoint = System.currentTimeMillis();
@@ -683,7 +683,7 @@
}
if (logDEBUG)
Core.logger.log(this, "Finished executing checkpoint on loadStats",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
public final void dump(PrintWriter pw) {
Index: NodeConsole.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeConsole.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NodeConsole.java 30 Oct 2003 02:39:38 -0000 1.7
+++ NodeConsole.java 31 Oct 2003 19:21:19 -0000 1.8
@@ -1,5 +1,6 @@
package freenet.node;
+import freenet.Core;
import freenet.Version;
import freenet.interfaces.NIOInterface;
import freenet.support.Fields;
@@ -108,7 +109,7 @@
// uptime
- long uptime = (System.currentTimeMillis() - node.startupTimeMs) / 1000;
+ long uptime = (System.currentTimeMillis() - Node.startupTimeMs) / 1000;
long days = uptime / 86400;
long hours = (uptime % 86400) / 3600;
long minutes = (uptime % 3600) / 60;
@@ -132,8 +133,8 @@
out.println("<tr>");
out.println("<td valign=\"top\" align=\"right\" nowrap=\"nowrap\"><b>active
threads</b></td>");
out.println("<td> </td>");
- out.println("<td>" + node.threadFactory.activeThreads() + " / "
- + node.threadFactory.maximumThreads() + "</td>");
+ out.println("<td>" + Node.threadFactory.activeThreads() + " / "
+ + Node.threadFactory.maximumThreads() + "</td>");
out.println("</tr>");
// free space
@@ -167,7 +168,7 @@
out.print("<td align=\"center\">");
if (node.interfaces[i].getExceptionCount() > 0) {
// keep link fresh
- String t = Fields.longToHex(node.getRandSource().nextLong());
+ String t = Fields.longToHex(Core.getRandSource().nextLong());
out.print("<a href=\"?show_errors="+i+"&t="+t+"\">");
out.print(node.interfaces[i].getExceptionCount());
out.print("</a>");
Index: IPAddressDetector.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/IPAddressDetector.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- IPAddressDetector.java 18 Sep 2003 17:48:09 -0000 1.20
+++ IPAddressDetector.java 31 Oct 2003 19:21:19 -0000 1.21
@@ -101,7 +101,7 @@
old = true;
} catch (SocketException e) {
Core.logger.log(this, "SocketException trying to detect
NetworkInterfaces", e,
- Core.logger.ERROR);
+ Logger.ERROR);
addrs.add(oldDetect());
old = true;
}
@@ -112,7 +112,7 @@
(java.net.NetworkInterface)(interfaces.nextElement());
if(logDEBUG)
Core.logger.log(this, "Scanning NetworkInterface "+
- iface.getDisplayName(), Core.logger.DEBUG);
+ iface.getDisplayName(), Logger.DEBUG);
Enumeration ee = iface.getInetAddresses();
while(ee.hasMoreElements()) {
@@ -120,7 +120,7 @@
addrs.add(addr);
if(logDEBUG)
Core.logger.log(this, "Adding address "+addr+" from "+
- iface.getDisplayName(), Core.logger.DEBUG);
+ iface.getDisplayName(), Logger.DEBUG);
}
if(logDEBUG) Core.logger.log(this, "Finished scanning interface "+
iface.getDisplayName(), Logger.DEBUG);
@@ -144,7 +144,7 @@
Core.logger.log(this, "Public IP Address changed from "+
oldAddress.getHostAddress() +" to "+
lastInetAddress.getHostAddress(),
- Core.logger.MINOR);
+ Logger.MINOR);
Main.newInetAddress(lastInetAddress);
// We know it changed
}
@@ -160,7 +160,7 @@
ds = new DatagramSocket();
} catch (SocketException e) {
Core.logger.log(this, "SocketException", e,
- Core.logger.ERROR);
+ Logger.ERROR);
return null;
}
@@ -170,7 +170,7 @@
ds.connect(InetAddress.getByName("198.41.0.4"), 42);
} catch (UnknownHostException ex) {
Core.logger.log(this, "UnknownHostException", ex,
- Core.logger.ERROR);
+ Logger.ERROR);
return null;
}
return ds.getLocalAddress();
@@ -191,26 +191,26 @@
Logger.DEBUG);
boolean detectedInetAddress = false;
if(v.size() == 0) {
- Core.logger.log(this, "No addresses found!", Core.logger.ERROR);
+ Core.logger.log(this, "No addresses found!", Logger.ERROR);
lastInetAddress = null;
} else {
InetAddress lastNonValidAddress = null;
for(int x=0;x<v.size();x++) {
if(v.elementAt(x) != null) {
InetAddress i = (InetAddress)(v.elementAt(x));
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, "Address "+x+":
"+i,Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, "Address "+x+":
"+i,Logger.DEBUG);
if(isInternetAddress(i)) { //Do not even consider this address
if it isn't globally addressable
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Setting default address
to "+
- i.getHostAddress(),Core.logger.DEBUG);
+ i.getHostAddress(),Logger.DEBUG);
lastInetAddress = i; //Use the last detected
valid IP as 'detected' IP
detectedInetAddress = true;
if(preferedInetAddress != null &&
lastInetAddress.equals(preferedInetAddress)){ //Prefer the specified address if it is
still available to us. Do not look for more ones
-
if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this,
"Detected address is the preferred address, setting final address to "+
-
lastInetAddress.getHostAddress(),Core.logger.DEBUG);
+
lastInetAddress.getHostAddress(),Logger.DEBUG);
return;
}
Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Main.java,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -w -r1.286 -r1.287
--- Main.java 31 Oct 2003 17:54:42 -0000 1.286
+++ Main.java 31 Oct 2003 19:21:19 -0000 1.287
@@ -155,6 +155,7 @@
import freenet.thread.QThreadFactory;
import freenet.thread.ThreadFactory;
import freenet.thread.YThreadFactory;
+import freenet.transport.ReadSelectorLoop;
import freenet.transport.TCP;
import freenet.transport.tcpAddress;
import freenet.transport.tcpConnection;
@@ -468,7 +469,7 @@
System.getProperty("java.vm.vendor")+":"+
System.getProperty("java.vm.name")+":"+
System.getProperty("java.vm.version"),
[...1327 lines suppressed...]
" from temp space successfully.",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else { // status > 0 || status < 0
Core.logger.log(this, "Impossible to delete temp file of size "+
length, new Exception("debug"),
- Core.logger.ERROR);
+ Logger.ERROR);
}
}
public void createFile(long length) throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Creating file of size "+length,
- Core.logger.DEBUG);
+ Logger.DEBUG);
enlargeFile(-1, length);
}
}
Index: NodeConfigUpdater.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeConfigUpdater.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- NodeConfigUpdater.java 30 Oct 2003 01:34:03 -0000 1.15
+++ NodeConfigUpdater.java 31 Oct 2003 19:21:19 -0000 1.16
@@ -85,7 +85,7 @@
newParams.readParams(Main.paramFile);
} catch (Throwable e) {
newParams = null;
- Core.logger.log(this, "Config file changed but was not readable.", e,
Core.logger.ERROR);
+ Core.logger.log(this, "Config file changed but was not readable.", e,
Logger.ERROR);
return;
}
}
@@ -98,7 +98,7 @@
if (((oldParams.getParam(newOptions[i].name()) == null) ^
(newParams.getParam(newOptions[i].name()) == null)) ||
!oldParams.getParam(newOptions[i].name()).equalsIgnoreCase(newParams.getParam(newOptions[i].name())))
try {
options.getClass().getMethod(newOptions[i].name(),
null).invoke(options, null);
} catch (Throwable e) {
- Core.logger.log(NodeConfigUpdater.class, "Option " +
newOptions[i].name() + " changed to " + newParams.getParam(newOptions[i].name()) + "
but no handler was available.", e, Core.logger.ERROR);
+ Core.logger.log(NodeConfigUpdater.class, "Option " +
newOptions[i].name() + " changed to " + newParams.getParam(newOptions[i].name()) + "
but no handler was available.", e, Logger.ERROR);
}
}
oldParams = newParams;
@@ -211,8 +211,8 @@
if (updateInterval == interval) return;
updateInterval = interval;
if (interval == 0)
- Core.logger.log(NodeConfigUpdater.class, "Disabled on-the-fly config
updater.", Core.logger.NORMAL);
- else Core.logger.log(NodeConfigUpdater.class, "Changed interval to check
for configuration updates to " + interval + " minutes.", Core.logger.NORMAL);
+ Core.logger.log(NodeConfigUpdater.class, "Disabled on-the-fly config
updater.", Logger.NORMAL);
+ else Core.logger.log(NodeConfigUpdater.class, "Changed interval to check
for configuration updates to " + interval + " minutes.", Logger.NORMAL);
}
public void logLevel() {
@@ -244,16 +244,16 @@
public void aggressiveGC() {
int interval = newParams.getInt("aggressiveGC");
- if (Main.node.aggressiveGC == interval) return;
- if ((Main.node.aggressiveGC <= 0) && (interval != 0)) {
- Main.node.aggressiveGC = interval;
+ if (Node.aggressiveGC == interval) return;
+ if ((Node.aggressiveGC <= 0) && (interval != 0)) {
+ Node.aggressiveGC = interval;
new Checkpoint(new
Main.GarbageCollectionCheckpointed()).schedule(Main.node);
- Core.logger.log(NodeConfigUpdater.class, "Enabled aggressive garbage
collection with a " + interval + " second interval.", Core.logger.NORMAL);
+ Core.logger.log(NodeConfigUpdater.class, "Enabled aggressive garbage
collection with a " + interval + " second interval.", Logger.NORMAL);
} else {
- Main.node.aggressiveGC = interval;
+ Node.aggressiveGC = interval;
if (interval == 0)
- Core.logger.log(NodeConfigUpdater.class, "Disabled aggressive
garbage collection.", Core.logger.NORMAL);
- else Core.logger.log(NodeConfigUpdater.class, "Changed aggressive
garbage collection interval to " + interval + " seconds.", Core.logger.NORMAL);
+ Core.logger.log(NodeConfigUpdater.class, "Disabled aggressive
garbage collection.", Logger.NORMAL);
+ else Core.logger.log(NodeConfigUpdater.class, "Changed aggressive
garbage collection interval to " + interval + " seconds.", Logger.NORMAL);
}
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
