Make shutdown handling safer (#1404)

* Make shutdown behavior safer Co-authored-by: Peter Bushnell <[email protected]>
DeFiCh · Aug 2, 2022 · 4783aa0 · 4783aa0
1 parent 2247f0f
commit 4783aa0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -795,6 +795,10 @@ static void ThreadImport(std::vector<fs::path> vImportFiles)
         if (file) {
             LogPrintf("Importing blocks file %s...\n", path.string());
             LoadExternalBlockFile(chainparams, file);
+            if (ShutdownRequested()) {
+                LogPrintf("Shutdown requested. Exit %s\n", __func__);
+                return;
+            }
         } else {
             LogPrintf("Warning: Could not open blocks file %s\n", path.string());
         }

diff --git a/src/masternodes/anchors.h b/src/masternodes/anchors.h
@@ -276,8 +276,6 @@ class CAnchorIndex
 
         while (pcursor->Valid())
         {
-            // ShutdownRequested replaces interruption_point
-            if (ShutdownRequested()) break;
             std::pair<char, Key> key;
             if (pcursor->GetKey(key) && key.first == prefix)
             {

diff --git a/src/spv/spv_wrapper.h b/src/spv/spv_wrapper.h
@@ -197,8 +197,6 @@ class CSpvWrapper
 
         while (pcursor->Valid())
         {
-            // ShutdownRequested replaces interruption_point
-            if (ShutdownRequested()) break;
             std::pair<char, Key> key;
             if (pcursor->GetKey(key) && key.first == prefix)
             {
@@ -226,8 +224,6 @@ class CSpvWrapper
 
         while (pcursor->Valid())
         {
-            // ShutdownRequested replaces interruption_point
-            if (ShutdownRequested()) break;
             std::pair<char, Key> key;
             if (pcursor->GetKey(key) && key.first == prefix)
             {
@@ -256,7 +252,7 @@ class CFakeSpvWrapper : public CSpvWrapper
     CFakeSpvWrapper();
 
     void Connect() override;
-    void Disconnect() override;
+    void Disconnect() override; 
     bool IsConnected() const override;
     void CancelPendingTxs() override;