[freenet-cvs] r14022 - trunk/freenet/src/freenet/node

[zot...@freenetproject.org]

Author: zothar
Date: 2007-07-11 12:50:38 +0000 (Wed, 11 Jul 2007)
New Revision: 14022

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Logging: peerNodeStatus and peerNodeRoutingBackoffReason

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-07-10 22:21:18 UTC 
(rev 14021)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-07-11 12:50:38 UTC 
(rev 14022)
@@ -998,14 +998,14 @@
                        if(peerNodeStatuses.containsKey(peerNodeStatus)) {
                                statusSet = (HashSet) 
peerNodeStatuses.get(peerNodeStatus);
                                if(statusSet.contains(peerNode)) {
-                                       Logger.error(this, 
"addPeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' already in 
peerNodeStatuses as "+peerNode+" with status code "+peerNodeStatus);
+                                       Logger.error(this, 
"addPeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' already in 
peerNodeStatuses as "+peerNode.getPeer()+" with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'");
                                        return;
                                }
                                peerNodeStatuses.remove(peerNodeStatus);
                        } else {
                                statusSet = new HashSet();
                        }
-                       if(logMINOR) Logger.minor(this, "addPeerNodeStatus(): 
adding PeerNode for '"+peerNode.getIdentityString()+"' with status code 
"+peerNodeStatus);
+                       if(logMINOR) Logger.minor(this, "addPeerNodeStatus(): 
adding PeerNode for '"+peerNode.getIdentityString()+"' with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'");
                        statusSet.add(peerNode);
                        peerNodeStatuses.put(peerNodeStatus, statusSet);
                }
@@ -1037,14 +1037,14 @@
                        if(peerNodeStatuses.containsKey(peerNodeStatus)) {
                                statusSet = (HashSet) 
peerNodeStatuses.get(peerNodeStatus);
                                if(!statusSet.contains(peerNode)) {
-                                       Logger.error(this, 
"removePeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' not in 
peerNodeStatuses with status code "+peerNodeStatus);
+                                       Logger.error(this, 
"removePeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' not in 
peerNodeStatuses with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'");
                                        return;
                                }
                                peerNodeStatuses.remove(peerNodeStatus);
                        } else {
                                statusSet = new HashSet();
                        }
-                       if(logMINOR) Logger.minor(this, 
"removePeerNodeStatus(): removing PeerNode for 
'"+peerNode.getIdentityString()+"' with status code "+peerNodeStatus);
+                       if(logMINOR) Logger.minor(this, 
"removePeerNodeStatus(): removing PeerNode for 
'"+peerNode.getIdentityString()+"' with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'");
                        if(statusSet.contains(peerNode)) {
                                statusSet.remove(peerNode);
                        }
@@ -1061,7 +1061,7 @@
                        
if(peerNodeRoutingBackoffReasons.containsKey(peerNodeRoutingBackoffReason)) {
                                reasonSet = (HashSet) 
peerNodeRoutingBackoffReasons.get(peerNodeRoutingBackoffReason);
                                if(reasonSet.contains(peerNode)) {
-                                       Logger.error(this, 
"addPeerNodeRoutingBackoffReason(): identity '"+peerNode.getIdentityString()+"' 
already in peerNodeRoutingBackoffReasons as "+peerNode+" with status code 
"+peerNodeRoutingBackoffReason);
+                                       Logger.error(this, 
"addPeerNodeRoutingBackoffReason(): identity '"+peerNode.getIdentityString()+"' 
already in peerNodeRoutingBackoffReasons as "+peerNode.getPeer()+" with status 
code "+peerNodeRoutingBackoffReason);
                                        return;
                                }
                                
peerNodeRoutingBackoffReasons.remove(peerNodeRoutingBackoffReason);

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-07-10 22:21:18 UTC 
(rev 14021)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-07-11 12:50:38 UTC 
(rev 14022)
@@ -2281,6 +2281,10 @@

   public String getPeerNodeStatusString() {
        int status = getPeerNodeStatus();
+       return getPeerNodeStatusString(status);
+  }
+
+  public static String getPeerNodeStatusString(int status) {
        if(status == PeerManager.PEER_NODE_STATUS_CONNECTED)
                return "CONNECTED";
        if(status == PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF)
@@ -2308,6 +2312,10 @@

   public String getPeerNodeStatusCSSClassName() {
        int status = getPeerNodeStatus();
+       return getPeerNodeStatusCSSClassName(status);
+  }
+
+  public static String getPeerNodeStatusCSSClassName(int status) {
        if(status == PeerManager.PEER_NODE_STATUS_CONNECTED)
                return "peer_connected";
        if(status == PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF)
@@ -2370,7 +2378,7 @@
                }
                if(peerNodeStatus != oldPeerNodeStatus) {
                        peers.removePeerNodeStatus( oldPeerNodeStatus, this );
-                 peers.addPeerNodeStatus( peerNodeStatus, this );
+                       peers.addPeerNodeStatus( peerNodeStatus, this );
                }
                return peerNodeStatus;
     }