rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 19:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

daemon: stop miner before we bring the whole thing down

Browse Source 
This avoids the miner erroring out trying to submit blocks
to a core that's already shut down (and avoids pegging
the CPU while we're busy shutting down).
This commit is contained in:
moneromooo-monero 2018-11-30 14:53:38 +00:00
parent 58ce16d4d9
commit aba9a9c277
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cryptonote_core/cryptonote_core.cpp
View File

@ -247,6 +247,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;

2
src/daemon/daemon.cpp
View File

@ -198,7 +198,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;
} }
@ -220,7 +219,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();