[freenet-cvs] r17796 - trunk/freenet/src/freenet/node/simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-02-11 21:58:37 +0000 (Mon, 11 Feb 2008)
New Revision: 17796

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
Log:
Logging

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-02-11 20:49:08 UTC (rev 17795)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-02-11 21:58:37 UTC (rev 17796)
@@ -52,7 +52,7 @@
         }
         wd.mkdir();
         //NOTE: globalTestInit returns in ignored random source
-        NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:normal,freenet.node.simulator.RealNodeRoutingTest:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
+        NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node:MINOR,freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR,freenet.node.PeerManager:MINOR");
         System.out.println("Insert/retrieve test");
         System.out.println();
         DummyRandomSource random = new DummyRandomSource();

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-11 
20:49:08 UTC (rev 17795)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-11 
21:58:37 UTC (rev 17796)
@@ -111,13 +111,19 @@
                                totalConnections += countConnected;
                                if(countConnected == countTotal)
                                        countFullyConnected++;
+                               else {
+                                       if(Logger.shouldLog(Logger.MINOR, 
RealNodeTest.class)) 
+                                               
Logger.minor(RealNodeTest.class, "Connection count for "+nodes[i]+" : 
"+countConnected);
+                               }
                        }
                        if(countFullyConnected == nodes.length) {
                                System.err.println("All nodes fully connected");
+                               Logger.normal(RealNodeTest.class, "All nodes 
fully connected");
                                System.err.println();
                                return;
                        } else {
                                System.err.println("Waiting for nodes to be 
fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total)");
+                               Logger.normal(RealNodeTest.class, "Waiting for 
nodes to be fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total)");
                                Thread.sleep(1000);
                        }
                }