Author: toad
Date: 2009-01-16 14:08:28 +0000 (Fri, 16 Jan 2009)
New Revision: 25081
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Logging
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-01-16 14:05:38 UTC (rev
25080)
+++ trunk/freenet/src/freenet/node/Node.java 2009-01-16 14:08:28 UTC (rev
25081)
@@ -4079,7 +4079,7 @@
if(!this.registerTurtleTransfer(sender)) {
// Too many turtles running, or already two turtles for
this key (we allow two in case one peer turtles as a DoS).
sender.killTurtle();
- System.err.println("Didn't make turtle (global) for key
"+sender.key+" for "+sender);
+ Logger.error(this, "Didn't make turtle (global) for key
"+sender.key+" for "+sender);
return;
}
PeerNode from = sender.transferringFrom();
@@ -4088,10 +4088,10 @@
// Abort it.
unregisterTurtleTransfer(sender);
sender.killTurtle();
- System.err.println("Didn't make turtle (peer) for key
"+sender.key+" for "+sender);
+ Logger.error(this, "Didn't make turtle (peer) for key
"+sender.key+" for "+sender);
return;
}
- System.err.println("TURTLING: "+sender.key+" for "+sender);
+ Logger.error(this, "TURTLING: "+sender.key+" for "+sender);
// Do not transfer coalesce!!
synchronized(transferringRequestSenders) {
transferringRequestSenders.remove((NodeCHK)sender.key);
@@ -4115,17 +4115,17 @@
Key key = sender.key;
synchronized(turtlingTransfers) {
if(getNumIncomingTurtles() >= MAX_TURTLES) {
- System.err.println("Too many turtles running
globally");
+ Logger.error(this, "Too many turtles running
globally");
return false;
}
if(!turtlingTransfers.containsKey(key)) {
turtlingTransfers.put(key, new RequestSender[]
{ sender });
- System.err.println("Running turtles:
"+turtlingTransfers.size());
+ Logger.error(this, "Running turtles:
"+turtlingTransfers.size());
return true;
} else {
RequestSender[] senders =
turtlingTransfers.get(key);
if(senders.length >= MAX_TURTLES_PER_KEY) {
- System.err.println("Too many turtles
for key globally");
+ Logger.error(this, "Too many turtles
for key globally");
return false;
}
for(int i=0;i<senders.length;i++) {
@@ -4138,7 +4138,7 @@
System.arraycopy(senders, 0, newSenders, 0,
senders.length);
newSenders[senders.length] = sender;
turtlingTransfers.put(key, newSenders);
- System.err.println("Running turtles:
"+turtlingTransfers.size());
+ Logger.error(this, "Running turtles:
"+turtlingTransfers.size());
return true;
}
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2009-01-16 14:05:38 UTC
(rev 25080)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2009-01-16 14:08:28 UTC
(rev 25081)
@@ -4275,15 +4275,15 @@
Key key = sender.key;
synchronized(turtlingTransfers) {
if(turtlingTransfers.size() >= MAX_TURTLES_PER_PEER) {
- System.err.println("Too many turtles for peer");
+ Logger.error(this, "Too many turtles for peer");
return false;
}
if(turtlingTransfers.containsKey(key)) {
- System.err.println("Already fetching key from
peer");
+ Logger.error(this, "Already fetching key from
peer");
return false;
}
turtlingTransfers.put(key, sender);
- System.err.println("Turtles for "+getPeer()+" :
"+turtlingTransfers.size());
+ Logger.error(this, "Turtles for "+getPeer()+" :
"+turtlingTransfers.size());
return true;
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
