Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv10922/src/freenet/node/states/request

Modified Files:
        RequestState.java Pending.java 
Log Message:
Added a 'boolean logMINOR' and an if(logMINOR)

Index: RequestState.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/RequestState.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RequestState.java   18 Sep 2003 17:48:12 -0000      1.15
+++ RequestState.java   9 Oct 2003 15:22:10 -0000       1.16
@@ -41,6 +41,7 @@
     Routing routes;
     
     boolean logDEBUG;
+       boolean logMINOR;
 
     
     int unreachable = 0,    // send failures
@@ -57,7 +58,8 @@
         origPeer = orig;
         this.ft = ft;
         this.ri = ri;
-       logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
+               logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
+               logMINOR = Core.logger.shouldLog(Logger.MINOR,this);
     }
 
     /** If one RequestState is derived from another, we must maintain

Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Pending.java        9 Oct 2003 15:08:56 -0000       1.66
+++ Pending.java        9 Oct 2003 15:22:10 -0000       1.67
@@ -262,6 +262,7 @@
            long searchDataTime = System.currentTimeMillis();
            searchDataRoutingTime = searchDataTime - regotTime;
            if(searchDataTime - regotTime > 1000)
+               if(logMINOR)
                n.logger.log(this, "searchDataRoutingTime took "+
                             (searchDataTime - regotTime)+"ms on "+
                             this+"!", Core.logger.MINOR);
@@ -275,6 +276,7 @@
            gotRouteTime = System.currentTimeMillis();
            n.diagnostics.occurrenceContinuous("getRouteTime", gotRouteTime - 
searchDataTime);
            if((gotRouteTime - searchDataTime) > 1000)
+               if(logMINOR)
                n.logger.log(this, "getting routing object took "+
                             (gotRouteTime - searchDataTime)+
                             " for "+this, Logger.MINOR);
@@ -282,18 +284,16 @@
                n.logger.log(this, "Routing: "+routes+" for "+this,
                             Logger.DEBUG);
         } else {
-           
             ++restarted;
             
            if(logDEBUG) {
-               n.logger.log(this, "Restarting Pending chain "+
-                            this, new Exception("debug"),
-                            Logger.DEBUG);
-               n.ticker().getMessageHandler().
-                   printChainInfo(id, Core.logStream);
-               n.logger.log(this, "Restarting Pending chain "+
-                            this+" his was:", 
-                            ri.initException, Logger.DEBUG);
+                       n.logger.log(this, "Restarting Pending chain "+
+                               this, new Exception("debug"),
+                               Logger.DEBUG);
+                       n.ticker().getMessageHandler().printChainInfo(id, 
Core.logStream);
+                       n.logger.log(this, "Restarting Pending chain "+
+                               this+" his was:", 
+                               ri.initException, Logger.DEBUG);
            }
            
             n.diagnostics.occurrenceBinomial("restartedRequestAccepted",

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to