Author: toad
Date: 2006-07-25 23:56:42 +0000 (Tue, 25 Jul 2006)
New Revision: 9766

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
902: Don't count resuming persistent requests as part of startup for purposes 
of the wrapper startup timeout.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-25 23:46:05 UTC (rev 
9765)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-25 23:56:42 UTC (rev 
9766)
@@ -1883,11 +1883,19 @@
                if(NodeStarter.RECOMMENDED_EXT_BUILD_NUMBER > 
NodeStarter.extBuildNumber)
                        this.alerts.register(new ExtOldAgeUserAlert());

-               this.fcpServer.finishStart();
-               
-               persistentTempBucketFactory.completedInit();
-               
-               this.hasStarted = true;
+               Thread completer = new Thread(new Runnable() {
+                       public void run() {
+                               System.out.println("Resuming persistent 
requests");
+                               Logger.normal(this, "Resuming persistent 
requests");
+                               fcpServer.finishStart();
+                               persistentTempBucketFactory.completedInit();
+                               hasStarted = true;
+                               System.out.println("Completed startup: All 
persistent requests resumed or restarted");
+                               Logger.normal(this, "Completed startup: All 
persistent requests resumed or restarted");
+                       }
+               }, "Startup completion thread");
+               completer.setDaemon(true);
+               completer.start();
        }

        private void shouldInsertARK() {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-25 23:46:05 UTC (rev 
9765)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-25 23:56:42 UTC (rev 
9766)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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


Reply via email to