From 80acc85e59618f59c4f4ef8210fae93a19153da7 Mon Sep 17 00:00:00 2001
From: Mike Ellery <mellery451@gmail.com>
Date: Tue, 17 Sep 2019 16:28:21 -0700
Subject: [PATCH] Fix startup error with `--import`

---
 src/ripple/app/main/Application.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index b4603b97d..8b2232058 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -19,6 +19,7 @@
 
 #include <ripple/app/main/Application.h>
 #include <ripple/core/DatabaseCon.h>
+#include <ripple/core/Stoppable.h>
 #include <ripple/app/consensus/RCLValidations.h>
 #include <ripple/app/main/DBInit.h>
 #include <ripple/app/main/BasicApp.h>
@@ -930,21 +931,31 @@ public:
         if (config_->doImport)
         {
             auto j = logs_->journal("NodeObject");
-            NodeStore::DummyScheduler scheduler;
+            NodeStore::DummyScheduler dummyScheduler;
+            RootStoppable dummyRoot {"DummyRoot"};
             std::unique_ptr <NodeStore::Database> source =
                 NodeStore::Manager::instance().make_Database(
                     "NodeStore.import",
-                    scheduler,
+                    dummyScheduler,
                     0,
-                    *m_jobQueue,
+                    dummyRoot,
                     config_->section(ConfigSection::importNodeDatabase()),
                     j);
 
             JLOG(j.warn()) <<
-                "Node import from '" << source->getName() << "' to '" <<
-                getNodeStore().getName() << "'.";
+                "Starting node import from '" << source->getName() <<
+                "' to '" << getNodeStore().getName() << "'.";
+
+            using namespace std::chrono;
+            auto const start = steady_clock::now();
 
             getNodeStore().import(*source);
+
+            auto const elapsed = duration_cast <seconds>
+                (steady_clock::now() - start);
+            JLOG(j.warn()) <<
+                "Node import from '" << source->getName() <<
+                "' took " << elapsed.count() << " seconds.";
         }
 
         // tune caches