Author: toad
Date: 2008-01-28 16:31:14 +0000 (Mon, 28 Jan 2008)
New Revision: 17362
Modified:
trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
More bulk transfer related logging
Modified: trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java 2008-01-28
16:25:22 UTC (rev 17361)
+++ trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java 2008-01-28
16:31:14 UTC (rev 17362)
@@ -47,6 +47,7 @@
/** Not expecting a response? */
final boolean noWait;
private long finishTime=-1;
+ private String cancelReason;
/**
* Create a bulk data transmitter.
@@ -77,7 +78,7 @@
prb.usm.addAsyncFilter(MessageFilter.create().setNoTimeout().setSource(peer).setType(DMT.FNPBulkReceiveAborted).setField(DMT.UID,
uid),
new AsyncMessageFilterCallback() {
public void onMatched(Message
m) {
- cancel();
+ cancel("Other side sent
FNPBulkReceiveAborted");
}
public boolean shouldTimeout() {
synchronized(BulkTransmitter.this) {
@@ -120,7 +121,7 @@
}
});
} catch (DisconnectedException e) {
- cancel();
+ cancel("Disconnected");
throw e;
}
packetSize = DMT.bulkPacketTransmitSize(prb.blockSize) +
@@ -159,12 +160,13 @@
}
}
- public void cancel() {
+ public void cancel(String reason) {
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Cancelling "+this);
sendAbortedMessage();
synchronized(this) {
cancelled = true;
+ cancelReason = reason;
notifyAll();
}
prb.remove(this);
@@ -227,7 +229,7 @@
long end = System.currentTimeMillis();
if(end - lastSentPacket > TIMEOUT) {
Logger.error(this, "Send timed out on
"+this);
- cancel();
+ cancel("Timeout");
return false;
}
continue;
@@ -277,7 +279,7 @@
}
lastSentPacket = System.currentTimeMillis();
} catch (NotConnectedException e) {
- cancel();
+ cancel("Disconnected");
if(logMINOR)
Logger.minor(this, "Canclled: not
connected "+this);
return false;
@@ -288,4 +290,8 @@
public String toString() {
return "BulkTransmitter:"+uid+":"+peer.shortToString();
}
+
+ public String getCancelReason() {
+ return cancelReason;
+ }
}
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-28 16:25:22 UTC
(rev 17361)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-28 16:31:14 UTC
(rev 17362)
@@ -911,7 +911,7 @@
}
public void onRejected() {
- transmitter.cancel();
+ transmitter.cancel("FileOffer: Offer rejected");
// FIXME prb's can't be shared, right? Well they aren't
here...
prb.abort(RetrievalException.CANCELLED_BY_RECEIVER,
"Cancelled by receiver");
}
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-01-28 16:25:22 UTC (rev 17361)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-01-28 16:31:14 UTC (rev 17362)
@@ -503,7 +503,7 @@
final Runnable r = new Runnable() {
public void run() {
if(!bt.send()) {
- Logger.error(this, "Failed to send
revocation key blob to "+source.userToString());
+ Logger.error(this, "Failed to send
revocation key blob to "+source.userToString()+" : "+bt.getCancelReason());
} else {
Logger.normal(this, "Sent revocation
key blob to "+source.userToString());
}
@@ -876,7 +876,7 @@
final Runnable r = new Runnable() {
public void run() {
if(!bt.send()) {
- Logger.error(this, "Failed to send main
jar blob to "+source.userToString());
+ Logger.error(this, "Failed to send main
jar blob to "+source.userToString()+" : "+bt.getCancelReason());
} else {
Logger.normal(this, "Sent main jar blob
to "+source.userToString());
}
