[freenet-cvs] r8791 - in trunk/freenet/src/freenet: node store

[zot...@freenetproject.org]

Author: zothar
Date: 2006-05-19 20:13:37 +0000 (Fri, 19 May 2006)
New Revision: 8791

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
- Datastore "Does not verify" messages now say what and why
- Reverted log level changing to "Backing off" messages, accidentally committed 
in r8790


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-05-19 19:50:05 UTC 
(rev 8790)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-05-19 20:13:37 UTC 
(rev 8791)
@@ -1341,7 +1341,7 @@
                                if( 0 < reason.length()) {
                                        reasonWrapper = " because of 
'"+reason+"'";
                                }
-                               Logger.normal(this, "Backing 
off"+reasonWrapper+": routingBackoffLength="+routingBackoffLength+", until 
"+x+"ms on "+getPeer());
+                               Logger.minor(this, "Backing 
off"+reasonWrapper+": routingBackoffLength="+routingBackoffLength+", until 
"+x+"ms on "+getPeer());
                        } else {
                                Logger.minor(this, "Ignoring 
localRejectedOverload: "+(routingBackedOffUntil-now)+"ms remaining on routing 
backoff on "+getPeer());
                        }

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-05-19 
19:50:05 UTC (rev 8790)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-05-19 
20:13:37 UTC (rev 8791)
@@ -209,7 +209,7 @@
                    Logger.minor(this, "Data: "+data.length+" bytes, hash 
"+data);

                }catch(CHKVerifyException ex){
-                       Logger.normal(this, "Does not verify ("+ex+"), setting 
accessTime to 0 for : "+chk);
+                       Logger.normal(this, "CHKBlock: Does not verify 
("+ex+"), setting accessTime to 0 for : "+chk);
                        storeBlock.setRecentlyUsedToZero();
                        DatabaseEntry updateDBE = new DatabaseEntry();
                        storeBlockTupleBinding.objectToEntry(storeBlock, 
updateDBE);
@@ -293,7 +293,7 @@
                    Logger.minor(this, "Data: "+data.length+" bytes, hash 
"+data);

                }catch(SSKVerifyException ex){
-                       Logger.normal(this, "Does not verify, setting 
accessTime to 0 for : "+chk, ex);
+                       Logger.normal(this, "SSHBlock: Does not verify 
("+ex+"), setting accessTime to 0 for : "+chk, ex);
                        storeBlock.setRecentlyUsedToZero();
                        DatabaseEntry updateDBE = new DatabaseEntry();
                        storeBlockTupleBinding.objectToEntry(storeBlock, 
updateDBE);
@@ -368,7 +368,7 @@
                        }

                        if(!Arrays.equals(block.asBytesHash(), hash)) {
-                               Logger.normal(this, "Does not verify, setting 
accessTime to 0 for : "+HexUtil.bytesToHex(hash));
+                               Logger.normal(this, "DSAPublicKey: Does not 
verify (unequal hashes), setting accessTime to 0 for : 
"+HexUtil.bytesToHex(hash));
                                storeBlock.setRecentlyUsedToZero();
                                DatabaseEntry updateDBE = new DatabaseEntry();
                                
storeBlockTupleBinding.objectToEntry(storeBlock, updateDBE);