Author: toad
Date: 2007-03-30 21:01:08 +0000 (Fri, 30 Mar 2007)
New Revision: 12460
Modified:
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Minor refactoring/logging
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-30
20:57:17 UTC (rev 12459)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-30
21:01:08 UTC (rev 12460)
@@ -1181,29 +1181,24 @@
}
private void wipeOldDatabases(String prefix) {
+ wipeDatabase(prefix+"CHK");
+ wipeDatabase(prefix+"CHK_accessTime");
+ wipeDatabase(prefix+"CHK_blockNum");
+ System.err.println("Removed old database "+prefix);
+ }
+
+ private void wipeDatabase(String name) {
WrapperManager.signalStarting(5*60*60*1000);
+ Logger.normal(this, "Wiping database "+name);
try {
- environment.removeDatabase(null, prefix+"CHK");
+ environment.removeDatabase(null, name);
+ } catch (DatabaseNotFoundException e) {
+ System.err.println("Database "+name+" does not exist
deleting it");
} catch (DatabaseException e) {
- Logger.error(this, "Could not remove old database:
"+(prefix+"CHK")+": "+e, e);
- System.err.println("Could not remove old database:
"+(prefix+"CHK")+": "+e);
+ Logger.error(this, "Could not remove old database:
"+name+": "+e, e);
+ System.err.println("Could not remove old database:
"+name+": "+e);
e.printStackTrace();
}
- try {
- environment.removeDatabase(null,
prefix+"CHK_accessTime");
- } catch (DatabaseException e) {
- Logger.error(this, "Could not remove old database
accesstime: "+e, e);
- System.err.println("Could not remove old database:
"+(prefix+"CHK_accessTime")+": "+e);
- e.printStackTrace();
- }
- try {
- environment.removeDatabase(null, prefix+"CHK_blockNum");
- } catch (DatabaseException e) {
- Logger.error(this, "Could not remove old database
blocknum: "+e, e);
- System.err.println("Could not remove old database:
"+(prefix+"CHK_blockNum")+": "+e);
- e.printStackTrace();
- }
- System.err.println("Removed old database "+prefix);
}
private void reconstruct(short type) throws DatabaseException,
IOException {
