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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-07-05 08:28:11 +0000 (Wed, 05 Jul 2006)
New Revision: 9467

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PacketSender.java
Log:
Silent the watchdog until the node is started

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-05 00:41:17 UTC (rev 
9466)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-05 08:28:11 UTC (rev 
9467)
@@ -652,6 +652,9 @@
        // The node starter
        private static NodeStarter nodeStarter;

+       // The watchdog will be silenced until it's true
+       private static boolean hasStarted = false;
+       
        // Debugging stuff
        private static final boolean USE_RAM_PUBKEYS_CACHE = true;

@@ -1725,6 +1728,7 @@
                        }
                }

+               this.hasStarted = true;
        }

        private void shouldInsertARK() {
@@ -3410,4 +3414,8 @@
                }
                return null;
        }
+
+       public boolean isHasStarted() {
+               return hasStarted;
+       }
 }

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-07-05 00:41:17 UTC 
(rev 9466)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-07-05 08:28:11 UTC 
(rev 9467)
@@ -63,7 +63,7 @@
                                long now = System.currentTimeMillis();
                                long recordedTime = ((long)lastTimeInSeconds) * 
1000;
                                long diff = now - recordedTime;
-                               if(diff > 3*60*1000) {
+                               if(diff > 3*60*1000 && node.isHasStarted()) {
                                        
if(!Node.logConfigHandler.getFileLoggerHook().hasRedirectedStdOutErrNoLock())
                                                System.err.println("Restarting 
node: PacketSender froze for 3 minutes! ("+diff+")");

@@ -344,7 +344,7 @@
         }
        }

-       void queuedResendPacket() {
+       protected void queuedResendPacket() {
         // Wake up if needed
         synchronized(this) {
             notifyAll();