[freenet-cvs] r7947 - in trunk/freenet/src/freenet: clients/http io/comm node store

[t...@freenetproject.org]

Author: toad
Date: 2006-01-27 02:01:32 +0000 (Fri, 27 Jan 2006)
New Revision: 7947

Modified:
   trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
   trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
398:
Logging for debugging.

Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-01-27 
01:02:20 UTC (rev 7946)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-01-27 
02:01:32 UTC (rev 7947)
@@ -33,6 +33,7 @@
                        return;
                }
                try {
+                       Logger.minor(this, "Fproxy fetching "+key);
                        FetchResult result = fetch(key);
                        writeReply(ctx, 200, result.getMimeType(), "OK", 
result.asBucket());
                } catch (FetchException e) {

Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-01-27 
01:02:20 UTC (rev 7946)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-01-27 
02:01:32 UTC (rev 7947)
@@ -125,9 +125,12 @@
                                                Logger.minor(this, "Null 
packet");
                                } catch (Throwable t) {
                                        Logger.error(this, "Caught " + t, t);
+                                       System.err.println("Caught "+t);
+                                       t.printStackTrace(System.err);
                                }
                        }
                } finally {
+                       System.err.println("run() exiting");
                        Logger.error(this, "run() exiting");
                        synchronized (this) {
                                _isDone = true;

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-01-27 01:02:20 UTC (rev 
7946)
+++ trunk/freenet/src/freenet/node/Node.java    2006-01-27 02:01:32 UTC (rev 
7947)
@@ -1397,7 +1397,7 @@
         */
        public DSAPublicKey getKey(byte[] hash) {
                ImmutableByteArrayWrapper w = new 
ImmutableByteArrayWrapper(hash);
-               Logger.minor(this, "Getting "+HexUtil.bytesToHex(hash));
+               Logger.minor(this, "Getting pubkey: "+HexUtil.bytesToHex(hash));
                synchronized(cachedPubKeys) {
                        DSAPublicKey key = (DSAPublicKey) cachedPubKeys.get(w);
                        if(key != null) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-27 01:02:20 UTC (rev 
7946)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-27 02:01:32 UTC (rev 
7947)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 397;
+       public static final int buildNumber = 398;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 392;

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-27 
01:02:20 UTC (rev 7946)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-27 
02:01:32 UTC (rev 7947)
@@ -336,10 +336,12 @@
                DSAPublicKey block = null;

                        byte[] data = new byte[dataBlockSize];
+                       Logger.minor(this, "Reading from store... 
"+storeBlock.offset);
                        synchronized(chkStore) {
                                
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
                                chkStore.read(data);
                        }
+                       Logger.minor(this, "Read");

                        try {
                                block = new DSAPublicKey(data);