monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

blockchain: include number of discarded blocks in --reorg-notify

Browse source
This commit is contained in:
moneromooo-monero 2019-02-06 22:01:40 +00:00
parent 4d598e3d4d
commit 356d813799
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_core/blockchain.cpp
View file

@ -1056,6 +1056,7 @@ bool Blockchain::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::
} }
// if we're to keep the disconnected blocks, add them as alternates // if we're to keep the disconnected blocks, add them as alternates
const size_t discarded_blocks = disconnected_chain.size();
if(!discard_disconnected_chain) if(!discard_disconnected_chain)
{ {
//pushing old chain as alternative chain //pushing old chain as alternative chain
@ -1083,7 +1084,7 @@ bool Blockchain::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::
std::shared_ptr<tools::Notify> reorg_notify = m_reorg_notify; std::shared_ptr<tools::Notify> reorg_notify = m_reorg_notify;
if (reorg_notify) if (reorg_notify)
reorg_notify->notify("%s", std::to_string(split_height).c_str(), "%h", std::to_string(m_db->height()).c_str(), reorg_notify->notify("%s", std::to_string(split_height).c_str(), "%h", std::to_string(m_db->height()).c_str(),
"%n", std::to_string(m_db->height() - split_height).c_str(), NULL); "%n", std::to_string(m_db->height() - split_height).c_str(), "%d", std::to_string(discarded_blocks).c_str(), NULL);
MGINFO_GREEN("REORGANIZE SUCCESS! on height: " << split_height << ", new blockchain size: " << m_db->height()); MGINFO_GREEN("REORGANIZE SUCCESS! on height: " << split_height << ", new blockchain size: " << m_db->height());
return true; return true;

5
src/cryptonote_core/cryptonote_core.cpp
View file

@ -188,8 +188,9 @@ namespace cryptonote
static const command_line::arg_descriptor<std::string> arg_reorg_notify = { static const command_line::arg_descriptor<std::string> arg_reorg_notify = {
"reorg-notify" "reorg-notify"
, "Run a program for each reorg, '%s' will be replaced by the split height, " , "Run a program for each reorg, '%s' will be replaced by the split height, "
"'%h' will be replaced by the new blockchain height, and '%n' will be " "'%h' will be replaced by the new blockchain height, '%n' will be "
"replaced by the number of new blocks in the new chain" "replaced by the number of new blocks in the new chain, and '%d' will be "
"replaced by the number of blocks discarded from the old chain"
, "" , ""
}; };
static const command_line::arg_descriptor<std::string> arg_block_rate_notify = { static const command_line::arg_descriptor<std::string> arg_block_rate_notify = {