[freenet-cvs] r13589 - trunk/freenet/src/freenet/node/updater

[t...@freenetproject.org]

Author: toad
Date: 2007-06-14 12:06:36 +0000 (Thu, 14 Jun 2007)
New Revision: 13589

Modified:
   trunk/freenet/src/freenet/node/updater/RevocationChecker.java
Log:
Conditional logging

Modified: trunk/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/RevocationChecker.java       
2007-06-14 12:03:10 UTC (rev 13588)
+++ trunk/freenet/src/freenet/node/updater/RevocationChecker.java       
2007-06-14 12:06:36 UTC (rev 13589)
@@ -97,8 +97,7 @@
                                                if(logMINOR) Logger.minor(this, 
"Revocation count "+revocationDNFCounter);
                                        }
                                        if(logMINOR) Logger.minor(this, 
"fetcher="+revocationGetter);
-                                       if(revocationGetter != null)
-                                               Logger.minor(this, "revocation 
fetcher: cancelled="+revocationGetter.isCancelled()+", 
finished="+revocationGetter.isFinished());
+                                       if(revocationGetter != null && 
logMINOR) Logger.minor(this, "revocation fetcher: 
cancelled="+revocationGetter.isCancelled()+", 
finished="+revocationGetter.isFinished());
                                        try {
                                                tmpBlobFile = 
File.createTempFile("revocation-", ".fblob.tmp", manager.node.getNodeDir());
                                        } catch (IOException e) {
@@ -182,8 +181,8 @@
        }

        void onFailure(FetchException e, ClientGetter state, File tmpBlobFile) {
-               Logger.minor(this, "Revocation fetch failed: "+e);
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
+               if(logMINOR) Logger.minor(this, "Revocation fetch failed: "+e);
                int errorCode = e.getMode();
                boolean completed = false;
                long now = System.currentTimeMillis();
@@ -203,7 +202,7 @@
                synchronized(this) {
                        if(errorCode == FetchException.DATA_NOT_FOUND){
                                revocationDNFCounter++;
-                               Logger.minor(this, "Incremented DNF counter to 
"+revocationDNFCounter);
+                               if(logMINOR) Logger.minor(this, "Incremented 
DNF counter to "+revocationDNFCounter);
                        }
                        if(revocationDNFCounter >= 3) {
                                lastSucceeded = now;