[freenet-cvs] r7706 - in trunk/freenet/src/freenet: io/comm node

[t...@freenetproject.org]

Author: toad
Date: 2005-12-10 20:04:52 +0000 (Sat, 10 Dec 2005)
New Revision: 7706

Modified:
   trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
303:
Logging.
Exit on main loop terminated.

Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2005-12-10 
19:52:25 UTC (rev 7705)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2005-12-10 
20:04:52 UTC (rev 7706)
@@ -66,8 +66,11 @@
                                }
                                if(UdpSocketManager.this.isAlive())
                                        Logger.minor(this, "PING on 
"+UdpSocketManager.this);
-                               else
+                               else {
                                        Logger.error(this, "MAIN LOOP 
TERMINATED");
+                                       System.err.println("MAIN LOOP 
TERMINATED!");
+                                       
System.exit(freenet.node.Node.EXIT_MAIN_LOOP_LOST);
+                               }
                        }
                }
        }

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2005-12-10 19:52:25 UTC (rev 
7705)
+++ trunk/freenet/src/freenet/node/Node.java    2005-12-10 20:04:52 UTC (rev 
7706)
@@ -156,6 +156,7 @@
     public static final int EXIT_YARROW_INIT_FAILED = 5;
     static final int EXIT_TEMP_INIT_ERROR = 6;
     static final int EXIT_TESTNET_FAILED = 7;
+    public static final int EXIT_MAIN_LOOP_LOST = 8;

     public final long bootID;
     public final long startupTime;

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2005-12-10 19:52:25 UTC 
(rev 7705)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2005-12-10 20:04:52 UTC 
(rev 7706)
@@ -56,6 +56,7 @@
             if(pn.isConnected()) {
                 // Is the node dead?
                 if(now - pn.lastReceivedPacketTime() > 
pn.maxTimeBetweenReceivedPackets()) {
+                       Logger.error(this, "Disconnecting from "+pn+" - haven't 
received packets recently");
                     pn.disconnected();
                     continue;
                 }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-10 19:52:25 UTC (rev 
7705)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-10 20:04:52 UTC (rev 
7706)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 302;
+       public static final int buildNumber = 303;

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