[freenet-cvs] r14915 - in trunk/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2007-08-29 17:10:03 +0000 (Wed, 29 Aug 2007)
New Revision: 14915

Modified:
   trunk/freenet/src/freenet/client/async/ClientGetter.java
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/node/Node.java
Log:
logging

Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetter.java    2007-08-29 
16:55:42 UTC (rev 14914)
+++ trunk/freenet/src/freenet/client/async/ClientGetter.java    2007-08-29 
17:10:03 UTC (rev 14915)
@@ -115,6 +115,8 @@
        }

        public void onSuccess(FetchResult result, ClientGetState state) {
+               if(Logger.shouldLog(Logger.MINOR, this))
+                       Logger.minor(this, "Succeeded from "+state);
                if(!closeBinaryBlobStream()) return;
                synchronized(this) {
                        finished = true;
@@ -152,6 +154,8 @@
        }

        public void onFailure(FetchException e, ClientGetState state) {
+               if(Logger.shouldLog(Logger.MINOR, this))
+                       Logger.minor(this, "Failed from "+state+" : "+e, e);
                closeBinaryBlobStream();
                while(true) {
                        if(e.mode == FetchException.ARCHIVE_RESTART) {

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-08-29 16:55:42 UTC (rev 14914)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-08-29 17:10:03 UTC (rev 14915)
@@ -232,7 +232,11 @@
                                                anyValid = true;
                                        }
                                }
-                               if(!anyValid) return;
+                               if(!anyValid) {
+                                       if(logMINOR)
+                                               Logger.minor(this, "No valid 
keys, returning without registering");
+                                       return;
+                               }
                        }
                }
                innerRegister(req);

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2007-08-29 16:55:42 UTC (rev 14914)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2007-08-29 17:10:03 UTC (rev 14915)
@@ -129,6 +129,8 @@
                }
                Bucket data = extract(block);
                if(data == null) {
+                       if(logMINOR)
+                               Logger.minor(this, "No data");
                        // Already failed: if extract returns null it will call 
onFailure first.
                        return;
                }

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-08-29 16:55:42 UTC (rev 
14914)
+++ trunk/freenet/src/freenet/node/Node.java    2007-08-29 17:10:03 UTC (rev 
14915)
@@ -2233,7 +2233,11 @@
                if(key == null) return null;
                clientSSK.setPublicKey(key);
                SSKBlock block = fetch((NodeSSK)clientSSK.getNodeKey(), 
dontPromote);
-               if(block == null) return null;
+               if(block == null) {
+                       if(logMINOR)
+                               Logger.minor(this, "Could not find key for 
"+clientSSK+" (dontPromote="+dontPromote+")");
+                       return null;
+               }
                // Move the pubkey to the top of the LRU, and fix it if it
                // was corrupt.
                cacheKey(clientSSK.pubKeyHash, key, false);