Author: zothar
Date: 2006-05-29 01:38:16 +0000 (Mon, 29 May 2006)
New Revision: 8909
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Added various logging bits, possibly the most notable being a complaint if
maybeLogPeerNodeStatusSummary() hasn't been called in three seconds (it's
usually about once a second and three seconds or more may indicate a
PacketSender hiccup).
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-05-29
01:01:52 UTC (rev 8908)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-05-29
01:38:16 UTC (rev 8909)
@@ -310,7 +310,7 @@
* @param replyTo
*/
private void sendFirstHalfDHPacket(int phase, NativeBigInteger integer,
PeerNode pn, Peer replyTo) {
- Logger.minor(this, "Sending ("+phase+") "+integer.toHexString());
+ Logger.minor(this, "Sending ("+phase+") "+integer.toHexString()+" to
"+pn.getPeer());
byte[] data = integer.toByteArray();
int targetLength = DiffieHellman.modulusLengthInBytes();
if(data.length != targetLength) {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-29 01:01:52 UTC (rev
8908)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-29 01:38:16 UTC (rev
8909)
@@ -2881,6 +2881,8 @@
*/
public void maybeLogPeerNodeStatusSummary(long now) {
if(now > nextPeerNodeStatusLogTime) {
+ if((now - nextPeerNodeStatusLogTime) > (3*60*1000))
+ Logger.error(this,"maybeLogPeerNodeStatusSummary() not called for
more than 3 seconds. PacketSender getting bogged down or something?");
int numberOfConnected = getNumStatusConnectedPeerNodes();
int numberOfRoutingBackedOff = getNumStatusRoutingBackedOffPeerNodes();
int numberOfTooNew = getNumStatusTooNewPeerNodes();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-05-29 01:01:52 UTC
(rev 8908)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-05-29 01:38:16 UTC
(rev 8909)
@@ -959,7 +959,7 @@
changedIP(replyTo);
if(thisBootID != this.bootID) {
connectedTime = System.currentTimeMillis();
- Logger.minor(this, "Changed boot ID from "+bootID+" to
"+thisBootID);
+ Logger.minor(this, "Changed boot ID from "+bootID+" to
"+thisBootID+" for "+getPeer());
isConnected = false; // Will be reset below
setPeerNodeStatus(now);
if(previousTracker != null) {
@@ -980,6 +980,7 @@
if(unverified) {
unverifiedTracker = newTracker;
ctx = null;
+ Logger.minor(this, "sentHandshake() being called for
unverifiedTracker: "+getPeer());
sentHandshake();
} else {
previousTracker = currentTracker;
@@ -993,7 +994,7 @@
}
if(!isConnected)
node.peers.disconnected(this);
- Logger.normal(this, "Completed handshake with "+this+" on "+replyTo+"
- current: "+currentTracker+" old: "+previousTracker+" unverified:
"+unverifiedTracker+" bootID: "+thisBootID);
+ Logger.normal(this, "Completed handshake with "+this+" on "+replyTo+"
- current: "+currentTracker+" old: "+previousTracker+" unverified:
"+unverifiedTracker+" bootID: "+thisBootID+" myName: "+myName);
try {
receivedPacket();
} catch (NotConnectedException e) {
@@ -1042,7 +1043,7 @@
long now = System.currentTimeMillis();
synchronized(this) {
if(tracker == unverifiedTracker) {
- Logger.minor(this, "Promoting unverified tracker "+tracker);
+ Logger.minor(this, "Promoting unverified tracker "+tracker+" for
"+getPeer());
if(previousTracker != null) {
previousTracker.completelyDeprecated(tracker);
}
@@ -1197,7 +1198,7 @@
changedAnything = true;
if(nominalPeer.isEmpty()) {
- Logger.normal(this, "No physical.udp in noderef for identity
'"+identityString+"', possibly at location '"+locationString+"'");
+ Logger.normal(this, "No physical.udp in noderef for identity
'"+identityString+"', possibly at location '"+locationString+"' with name
'"+myName+"'");
// detectedPeer stays as it is
} else {
/* yes, we pick up a random one : it will be updated on handshake
*/
