tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4923

Browse Source 
aba9a9c2 daemon: stop miner before we bring the whole thing down (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2018-12-12 12:00:37 +02:00
parent e9aa886d9e aba9a9c277
commit fe3c8c9682
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptonote_core/cryptonote_core.cpp
+1
View File
@@ -250,6 +250,7 @@ namespace cryptonote
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
void core::stop() void core::stop()
{ {
m_miner.stop();
m_blockchain_storage.cancel(); m_blockchain_storage.cancel();
tools::download_async_handle handle; tools::download_async_handle handle;
src/daemon/daemon.cpp
-2
View File
@@ -195,7 +195,6 @@ bool t_daemon::run(bool interactive)
for(auto& rpc : mp_internals->rpcs) for(auto& rpc : mp_internals->rpcs)
rpc->stop(); rpc->stop();
mp_internals->core.get().get_miner().stop();
MGINFO("Node stopped."); MGINFO("Node stopped.");
return true; return true;
} }
@@ -217,7 +216,6 @@ void t_daemon::stop()
{ {
throw std::runtime_error{"Can't stop stopped daemon"}; throw std::runtime_error{"Can't stop stopped daemon"};
} }
mp_internals->core.get().get_miner().stop();
mp_internals->p2p.stop(); mp_internals->p2p.stop();
for(auto& rpc : mp_internals->rpcs) for(auto& rpc : mp_internals->rpcs)
rpc->stop(); rpc->stop();