monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit fe3c8c9682
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
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

@ -250,6 +250,7 @@ namespace cryptonote
//-----------------------------------------------------------------------------------
void core::stop()
{
m_miner.stop();
m_blockchain_storage.cancel();
tools::download_async_handle handle;

2
src/daemon/daemon.cpp
View file

@ -195,7 +195,6 @@ bool t_daemon::run(bool interactive)
for(auto& rpc : mp_internals->rpcs)
rpc->stop();
mp_internals->core.get().get_miner().stop();
MGINFO("Node stopped.");
return true;
}
@ -217,7 +216,6 @@ void t_daemon::stop()
{
throw std::runtime_error{"Can't stop stopped daemon"};
}
mp_internals->core.get().get_miner().stop();
mp_internals->p2p.stop();
for(auto& rpc : mp_internals->rpcs)
rpc->stop();