Author: zothar
Date: 2006-05-30 03:06:30 +0000 (Tue, 30 May 2006)
New Revision: 8947

Modified:
   trunk/freenet/src/freenet/node/DNSRequester.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
758: Bump the version to get people to use the latest DNS related fixes.  Tweak 
some log message levels now that I've got things settled.

Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java    2006-05-30 02:39:52 UTC 
(rev 8946)
+++ trunk/freenet/src/freenet/node/DNSRequester.java    2006-05-30 03:06:30 UTC 
(rev 8947)
@@ -53,7 +53,7 @@
         PeerNode[] nodes = pm.myPeers;
         long now = System.currentTimeMillis();
         if((now - lastLogTime) > 1000) {
-            Logger.normal(this, "Processing DNS Requests (log rate-limited)");
+            Logger.minor(this, "Processing DNS Requests (log rate-limited)");
             lastLogTime = now;
         }
         for(int i=0;i<nodes.length;i++) {

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-05-30 02:39:52 UTC 
(rev 8946)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-05-30 03:06:30 UTC 
(rev 8947)
@@ -221,11 +221,11 @@
                     node.packetMangler.sendHandshake(pn);
                 long afterHandshakeTime = System.currentTimeMillis();
                 if((afterHandshakeTime - beforeHandshakeTime) > (2*1000))
-                    Logger.normal(this, "afterHandshakeTime is more than 2 
seconds past beforeHandshakeTime ("+(afterHandshakeTime - 
beforeHandshakeTime)+") in PacketSender working with "+pn.getPeer()+" named 
"+pn.getName());
+                    Logger.error(this, "afterHandshakeTime is more than 2 
seconds past beforeHandshakeTime ("+(afterHandshakeTime - 
beforeHandshakeTime)+") in PacketSender working with "+pn.getPeer()+" named 
"+pn.getName());
             }
                long tempNow = System.currentTimeMillis();
                if((tempNow - oldTempNow) > (5*1000))
-                       Logger.normal(this, "tempNow is more than 5 seconds 
past oldTempNow ("+(tempNow - oldTempNow)+") in PacketSender working with 
"+pn.getPeer()+" named "+pn.getName());
+                       Logger.error(this, "tempNow is more than 5 seconds past 
oldTempNow ("+(tempNow - oldTempNow)+") in PacketSender working with 
"+pn.getPeer()+" named "+pn.getName());
                oldTempNow = tempNow;
        }

@@ -241,7 +241,7 @@
         lastTimeInSeconds = (int) (now / 1000);

         if((now - oldNow) > (10*1000))
-            Logger.normal(this, "now is more than 10 seconds past oldNow 
("+(now - oldNow)+") in PacketSender");
+            Logger.error(this, "now is more than 10 seconds past oldNow 
("+(now - oldNow)+") in PacketSender");

         Vector jobsToRun = null;


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-05-30 02:39:52 UTC 
(rev 8946)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-05-30 03:06:30 UTC 
(rev 8947)
@@ -500,7 +500,7 @@
        // We want to come back right away for DNS requesting if this is our 
first time through
        if(!ignoreHostnames)
                lastAttemptedHandshakeIPUpdateTime = now;
-       Logger.normal(this, "Updating handshake IPs for peer '"+getPeer()+"' 
named '"+myName+"' ("+ignoreHostnames+")");
+       Logger.minor(this, "Updating handshake IPs for peer '"+getPeer()+"' 
named '"+myName+"' ("+ignoreHostnames+")");
        Peer[] localHandshakeIPs;
        Peer[] p = null;
        Peer[] myNominalPeer;
@@ -516,7 +516,7 @@
                        synchronized(this) {
                                handshakeIPs = localHandshakeIPs;
                        }
-                       Logger.normal(this, "1: maybeUpdateHandshakeIPs got a 
result of: "+handshakeIPsToString());
+                       Logger.minor(this, "1: maybeUpdateHandshakeIPs got a 
result of: "+handshakeIPsToString());
                        return;
                }
                localHandshakeIPs = new Peer[] { detectedPeer };
@@ -533,7 +533,7 @@
                synchronized(this) {
                        handshakeIPs = localHandshakeIPs;
                }
-               Logger.normal(this, "2: maybeUpdateHandshakeIPs got a result 
of: "+handshakeIPsToString());
+               Logger.minor(this, "2: maybeUpdateHandshakeIPs got a result of: 
"+handshakeIPsToString());
                return;
        }

@@ -571,7 +571,7 @@
        synchronized(this) {
                handshakeIPs = localHandshakeIPs;
        }
-       Logger.normal(this, "3: maybeUpdateHandshakeIPs got a result of: 
"+handshakeIPsToString());
+       Logger.minor(this, "3: maybeUpdateHandshakeIPs got a result of: 
"+handshakeIPsToString());
        return;
     }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-30 02:39:52 UTC (rev 
8946)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-30 03:06:30 UTC (rev 
8947)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 757;
+       private static final int buildNumber = 758;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 754;


Reply via email to