nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #675

Browse Source 
27d4e50 core: check whether an update is needed straight away (moneromooo-monero)
8892173 core: print "update needed" hard fork notifications in red (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-02-18 10:01:37 +02:00
commit 1889c0e81c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/cryptonote_core.cpp
View File

@ -943,14 +943,14 @@ namespace cryptonote
HardFork::State state = m_blockchain_storage.get_hard_fork_state(); HardFork::State state = m_blockchain_storage.get_hard_fork_state();
switch (state) { switch (state) {
case HardFork::LikelyForked: case HardFork::LikelyForked:
LOG_PRINT_L0(ENDL LOG_PRINT_RED_L0(ENDL
<< "**********************************************************************" << ENDL << "**********************************************************************" << ENDL
<< "Last scheduled hard fork is too far in the past." << ENDL << "Last scheduled hard fork is too far in the past." << ENDL
<< "We are most likely forked from the network. Daemon update needed now." << ENDL << "We are most likely forked from the network. Daemon update needed now." << ENDL
<< "**********************************************************************" << ENDL); << "**********************************************************************" << ENDL);
break; break;
case HardFork::UpdateNeeded: case HardFork::UpdateNeeded:
LOG_PRINT_L0(ENDL LOG_PRINT_RED_L0(ENDL
<< "**********************************************************************" << ENDL << "**********************************************************************" << ENDL
<< "Last scheduled hard fork time shows a daemon update is needed now." << ENDL << "Last scheduled hard fork time shows a daemon update is needed now." << ENDL
<< "**********************************************************************" << ENDL); << "**********************************************************************" << ENDL);

2
src/cryptonote_core/cryptonote_core.h
View File

@ -198,7 +198,7 @@ namespace cryptonote
std::string m_config_folder; std::string m_config_folder;
cryptonote_protocol_stub m_protocol_stub; cryptonote_protocol_stub m_protocol_stub;
epee::math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval; epee::math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval;
epee::math_helper::once_a_time_seconds<60*60*2, false> m_fork_moaner; epee::math_helper::once_a_time_seconds<60*60*2, true> m_fork_moaner;
epee::math_helper::once_a_time_seconds<60*2, false> m_txpool_auto_relayer; //!< interval for checking re-relaying txpool transactions epee::math_helper::once_a_time_seconds<60*2, false> m_txpool_auto_relayer; //!< interval for checking re-relaying txpool transactions
friend class tx_validate_inputs; friend class tx_validate_inputs;
std::atomic<bool> m_starter_message_showed; std::atomic<bool> m_starter_message_showed;