[freenet-cvs] r14386 - trunk/freenet/src/freenet/support/io

[t...@freenetproject.org]

Author: toad
Date: 2007-07-27 17:03:42 +0000 (Fri, 27 Jul 2007)
New Revision: 14386

Modified:
   trunk/freenet/src/freenet/support/io/BaseFileBucket.java
   trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
   trunk/freenet/src/freenet/support/io/TempFileBucket.java
Log:
Better logging

Modified: trunk/freenet/src/freenet/support/io/BaseFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BaseFileBucket.java    2007-07-27 
15:48:02 UTC (rev 14385)
+++ trunk/freenet/src/freenet/support/io/BaseFileBucket.java    2007-07-27 
17:03:42 UTC (rev 14386)
@@ -209,6 +209,8 @@
         * called twice. But length must still be valid when calling it.
         */
        protected synchronized void deleteFile() {
+               if(Logger.shouldLog(Logger.MINOR, this))
+                       Logger.minor(this, "Deleting "+getFile()+" for "+this, 
new Exception("debug"));
                getFile().delete();
        }


Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java       
2007-07-27 15:48:02 UTC (rev 14385)
+++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java       
2007-07-27 17:03:42 UTC (rev 14386)
@@ -91,6 +91,8 @@
                Iterator i = originalFiles.iterator();
                while(i.hasNext()) {
                        File f = (File) (i.next());
+                       if(Logger.shouldLog(Logger.MINOR, this))
+                               Logger.minor(this, "Deleting old tempfile "+f);
                        f.delete();
                }
        }

Modified: trunk/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempFileBucket.java    2007-07-27 
15:48:02 UTC (rev 14385)
+++ trunk/freenet/src/freenet/support/io/TempFileBucket.java    2007-07-27 
17:03:42 UTC (rev 14386)
@@ -180,12 +180,6 @@
        private boolean released;
        private boolean closing;

-       protected synchronized void deleteFile() {
-               if (logDebug)
-                       Logger.debug(this, "Deleting " + getFile());
-               getFile().delete();
-       }
-
        protected synchronized void resetLength() {
                if (logDebug)
                        Logger.debug(this, "Resetting length for " + getFile());