[freenet-cvs] r23431 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-11-08 18:33:02 +0000 (Sat, 08 Nov 2008)
New Revision: 23431

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Logging


Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-11-08 18:32:26 UTC (rev 23430)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-11-08 18:33:02 UTC (rev 23431)
@@ -337,6 +337,8 @@
                                                bytesOnZip += sz;
                                                // Put it in the zip.
                                                ph = new PutHandler(this, name, 
ZipPrefix+element.fullName, cm, data);
+                                               if(logMINOR)
+                                                       Logger.minor(this, 
"Putting file into container: "+element.fullName+" : "+ph);
                                                
elementsToPutInArchive.addLast(ph);
                                                numberOfFiles++;
                                                totalSize += data.size();
@@ -404,6 +406,8 @@
                while(true) {
                        try {
                                bucket = 
BucketTools.makeImmutableBucket(ctx.bf, baseMetadata.writeToByteArray());
+                               if(logMINOR)
+                                       Logger.minor(this, "Metadata bucket is 
"+bucket.size()+" bytes long");
                                break;
                        } catch (IOException e) {
                                fail(new 
InsertException(InsertException.BUCKET_ERROR, e, null));
@@ -478,6 +482,8 @@
                TarEntry ze;

                for(PutHandler ph : elementsToPutInArchive) {
+                       if(logMINOR)
+                               Logger.minor(this, "Putting into tar: "+ph+" 
data length "+ph.data.size()+" name "+ph.targetInArchive);
                        ze = new TarEntry(ph.targetInArchive);
                        ze.setModTime(0);
                        long size = ph.data.size();
@@ -488,6 +494,8 @@
                }

                // Add .metadata - after the rest.
+               if(logMINOR)
+                       Logger.minor(this, "Putting metadata into tar: length 
is "+inputBucket.size());
                ze = new TarEntry(".metadata");
                ze.setModTime(0); // -1 = now, 0 = 1970.
                long size = inputBucket.size();
@@ -501,6 +509,9 @@
                tarOS.flush();
                tarOS.close();

+               if(logMINOR)
+                       Logger.minor(this, "Archive size is 
"+outputBucket.size());
+               
                return ARCHIVE_TYPE.TAR.mimeTypes[0];
        }

@@ -572,9 +583,13 @@
                                PutHandler ph = (PutHandler) o;
                                Metadata meta = ph.metadata;
                                namesToByteArrays.put(name, meta);
+                               if(logMINOR)
+                                       Logger.minor(this, "Putting PutHandler 
into base metadata: "+ph+" name "+name);
                        } else if(o instanceof HashMap) {
                                HashMap subMap = new HashMap();
                                namesToByteArrays.put(name, subMap);
+                               if(logMINOR)
+                                       Logger.minor(this, "Putting hashmap 
into base metadata: "+name);
                                namesToByteArrays((HashMap)o, subMap);
                        } else
                                throw new IllegalStateException();