Author: toad
Date: 2009-01-15 20:27:57 +0000 (Thu, 15 Jan 2009)
New Revision: 25065
Modified:
trunk/freenet/src/freenet/io/comm/RetrievalException.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/RequestSender.java
Log:
Logging for turtling. Will be removed later.
Modified: trunk/freenet/src/freenet/io/comm/RetrievalException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/RetrievalException.java 2009-01-15
20:25:08 UTC (rev 25064)
+++ trunk/freenet/src/freenet/io/comm/RetrievalException.java 2009-01-15
20:27:57 UTC (rev 25065)
@@ -64,7 +64,7 @@
@Override
public String toString() {
- return _cause;
+ return getErrString(_reason)+":"+_cause;
}
public static String getErrString(int reason) {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-01-15 20:25:08 UTC (rev
25064)
+++ trunk/freenet/src/freenet/node/Node.java 2009-01-15 20:27:57 UTC (rev
25065)
@@ -4077,6 +4077,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 for key
"+sender.key+" for "+sender);
return;
}
PeerNode from = sender.transferringFrom();
@@ -4085,8 +4086,10 @@
// Abort it.
unregisterTurtleTransfer(sender);
sender.killTurtle();
+ System.err.println("Didn't make turtle for key
"+sender.key+" for "+sender);
return;
}
+ System.err.println("TURTLING: "+sender.key+" for "+sender);
// Do not transfer coalesce!!
synchronized(transferringRequestSenders) {
transferringRequestSenders.remove((NodeCHK)sender.key);
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2009-01-15 20:25:08 UTC
(rev 25064)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2009-01-15 20:27:57 UTC
(rev 25065)
@@ -813,6 +813,7 @@
if(!turtle)
next.transferSuccess();
else {
+ System.err.println("TURTLE
SUCCEEDED: "+key+" for "+this);
if(!turtleBackedOff)
next.transferFailed("Turtled transfer");
}
@@ -834,6 +835,11 @@
finish(SUCCESS, next, false);
return;
} catch (RetrievalException e) {
+ synchronized(this) {
+ if(turtleMode) {
+ System.err.println("TURTLE
FAILED: "+key+" for "+this+" : "+e);
+ }
+ }
if
(e.getReason()==RetrievalException.SENDER_DISCONNECTED)
Logger.normal(this, "Transfer failed (disconnect): "+e, e);
else
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
