diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-18 10:01:37 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-18 10:01:37 +0200 |
| commit | 1889c0e81c2fa436e201a4d98bbb57f1e6a738ca (patch) | |
| tree | a063ab208696c1bd138c46293dc606ab3bffad1c | |
| parent | Merge pull request #674 (diff) | |
| parent | core: check whether an update is needed straight away (diff) | |
| download | monero-1889c0e81c2fa436e201a4d98bbb57f1e6a738ca.tar.xz | |
Merge pull request #675
27d4e50 core: check whether an update is needed straight away (moneromooo-monero)
8892173 core: print "update needed" hard fork notifications in red (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 4 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 2c485d791..6f0fe88a4 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -943,14 +943,14 @@ namespace cryptonote HardFork::State state = m_blockchain_storage.get_hard_fork_state(); switch (state) { case HardFork::LikelyForked: - LOG_PRINT_L0(ENDL + LOG_PRINT_RED_L0(ENDL << "**********************************************************************" << 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 << "**********************************************************************" << ENDL); break; case HardFork::UpdateNeeded: - LOG_PRINT_L0(ENDL + LOG_PRINT_RED_L0(ENDL << "**********************************************************************" << ENDL << "Last scheduled hard fork time shows a daemon update is needed now." << ENDL << "**********************************************************************" << ENDL); diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h index 3c6f56749..32f0b2ad4 100644 --- a/src/cryptonote_core/cryptonote_core.h +++ b/src/cryptonote_core/cryptonote_core.h @@ -198,7 +198,7 @@ namespace cryptonote std::string m_config_folder; 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*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 friend class tx_validate_inputs; std::atomic<bool> m_starter_message_showed; |