Author: zothar
Date: 2006-05-16 02:19:19 +0000 (Tue, 16 May 2006)
New Revision: 8707
Modified:
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Sprinkle 'which peer' answers on some Logger.normal() messages.
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2006-05-15 21:50:55 UTC
(rev 8706)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2006-05-16 02:19:19 UTC
(rev 8707)
@@ -67,7 +67,7 @@
}
}
} catch (EOFException e) {
- Logger.normal(Message.class,"Message packet ends
prematurely while deserialising "+mspec.getName(), e);
+ Logger.normal(Message.class,peer.getPeer()+" sent a message
packet that ends prematurely while deserialising "+mspec.getName(), e);
return null;
} catch (IOException e) {
Logger.error(Message.class, "WTF?: "+e+" reading from
buffer stream", e);
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-05-15
21:50:55 UTC (rev 8706)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-05-16
02:19:19 UTC (rev 8707)
@@ -595,7 +595,7 @@
if(seqNumber != -1 && tracker.alreadyReceived(seqNumber)) {
tracker.queueAck(seqNumber);
- Logger.normal(this, "Received packet twice: "+seqNumber);
+ Logger.normal(this, "Received packet twice from
"+tracker.pn.getPeer()+": "+seqNumber);
return true;
}
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2006-05-15 21:50:55 UTC
(rev 8706)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2006-05-16 02:19:19 UTC
(rev 8707)
@@ -538,7 +538,7 @@
QueuedAckRequest qr =
(QueuedAckRequest)ackRequestQueue.removeByKey(new Integer(seqNo));
if(qr != null) qr.onAcked();
else
- Logger.normal(this, "Removing ack request twice? Null on
"+seqNo);
+ Logger.normal(this, "Removing ack request twice? Null on
"+seqNo+" from "+pn.getPeer());
}
/**
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2006-05-15 21:50:55 UTC
(rev 8706)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2006-05-16 02:19:19 UTC
(rev 8707)
@@ -933,7 +933,7 @@
}
}
}
- Logger.normal(this, "lostOrRestartedNode dumping "+v.size()+" swap
requests");
+ Logger.normal(this, "lostOrRestartedNode dumping "+v.size()+" swap
requests for "+pn.getPeer());
for(int i=0;i<v.size();i++) {
RecentlyForwardedItem item = (RecentlyForwardedItem) v.get(i);
// Just reject it to avoid locking problems etc
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-05-15 21:50:55 UTC
(rev 8706)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-05-16 02:19:19 UTC
(rev 8707)
@@ -113,12 +113,12 @@
return true;
}
if(node.shouldRejectRequest()) {
- Logger.normal(this, "Rejecting request preemptively");
+ Logger.normal(this, "Rejecting request from
"+m.getSource().getPeer()+" preemptively");
Message rejected = DMT.createFNPRejectedOverload(id, true);
try {
((PeerNode)(m.getSource())).sendAsync(rejected, null);
} catch (NotConnectedException e) {
- Logger.normal(this, "Rejecting (overload) data request: "+e);
+ Logger.normal(this, "Rejecting (overload) data request from
"+m.getSource().getPeer()+": "+e);
}
node.completed(id);
return true;
@@ -129,7 +129,7 @@
try {
((PeerNode)(m.getSource())).sendAsync(rejected, null);
} catch (NotConnectedException e) {
- Logger.normal(this, "Rejecting insert request: "+e);
+ Logger.normal(this, "Rejecting insert request from
"+m.getSource().getPeer()+": "+e);
}
return true;
} else {
@@ -151,17 +151,17 @@
try {
((PeerNode)(m.getSource())).sendAsync(rejected, null);
} catch (NotConnectedException e) {
- Logger.normal(this, "Rejecting insert request: "+e);
+ Logger.normal(this, "Rejecting insert request from
"+m.getSource().getPeer()+": "+e);
}
return true;
}
if(node.shouldRejectRequest()) {
- Logger.normal(this, "Rejecting insert preemptively");
+ Logger.normal(this, "Rejecting insert from
"+m.getSource().getPeer()+" preemptively");
Message rejected = DMT.createFNPRejectedOverload(id, true);
try {
((PeerNode)(m.getSource())).sendAsync(rejected, null);
} catch (NotConnectedException e) {
- Logger.normal(this, "Rejecting (overload) insert request: "+e);
+ Logger.normal(this, "Rejecting (overload) insert request from
"+m.getSource().getPeer()+": "+e);
}
node.completed(id);
return true;
@@ -172,7 +172,7 @@
try {
((PeerNode)(m.getSource())).sendAsync(rejected, null);
} catch (NotConnectedException e) {
- Logger.normal(this, "Rejecting insert request: "+e);
+ Logger.normal(this, "Rejecting insert request from
"+m.getSource().getPeer()+": "+e);
}
return true;
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-05-15 21:50:55 UTC
(rev 8706)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-05-16 02:19:19 UTC
(rev 8707)
@@ -263,7 +263,7 @@
throw new FSParseException(e1);
}
if(nominalPeer.isEmpty()) {
- Logger.normal(this, "No IP addresses found");
+ Logger.normal(this, "No IP addresses found for identity
'"+Base64.encode(identity)+"', possibly at location
'"+Double.toString(currentLocation.getValue())+"'");
detectedPeer = null;
} else
detectedPeer=(Peer) nominalPeer.firstElement();
@@ -898,7 +898,7 @@
sendAsync(locMsg, null);
sendAsync(ipMsg, null);
} catch (NotConnectedException e) {
- Logger.error(this, "Completed handshake but disconnected!!!", new
Exception("error"));
+ Logger.error(this, "Completed handshake with "+getPeer()+" but
disconnected!!!", new Exception("error"));
}
}
