also logging messages after the database drop; make the time variable…

… a double
aionnetwork · Feb 5, 2019 · 4dcd04f · 4dcd04f
1 parent ca84b04
commit 4dcd04f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java
@@ -789,8 +789,9 @@ public String toString() {
     public void dropDatabasesExcept(List<String> names) {
         for (IByteArrayKeyValueDatabase db : databaseGroup) {
             if (!names.contains(db.getName().get())) {
-                LOG.warn("Dropping database " + db.toString());
+                LOG.warn("Dropping database " + db.toString() + " ...");
                 db.drop();
+                LOG.warn(db.toString() + " successfully dropped and reopened.");
             }
         }
     }

diff --git a/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java b/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java
@@ -528,7 +528,7 @@ public AionBlockSummary getRight() {
                     }
 
                     if (currentBlock % stepSize == 0) {
-                        long time = System.currentTimeMillis() - start;
+                        double time = System.currentTimeMillis() - start;
 
                         double timePerBlock = time / (currentBlock - startHeight + 1);
                         long remainingBlocks = topBlockNumber - currentBlock;
@@ -538,9 +538,9 @@ public AionBlockSummary getRight() {
                                 "Finished with blocks up to "
                                         + currentBlock
                                         + " in "
-                                        + time
+                                        + String.format("%.0f", time + 1)
                                         + " ms (under "
-                                        + (time / 60_000 + 1)
+                                        + String.format("%.0f", time / 60_000 + 1)
                                         + " min). The average time per block is < "
                                         + String.format("%.0f", timePerBlock + 1)
                                         + " ms. Completion for remaining "