Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3181

Browse Source 
e3f0980a daemon: don't drop RPC with busy error when running offline (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:19:53 +01:00
commit bdf0339dda
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_protocol/cryptonote_protocol_handler.h
View File

@ -79,7 +79,7 @@ namespace cryptonote
typedef t_cryptonote_protocol_handler<t_core> cryptonote_protocol_handler; typedef t_cryptonote_protocol_handler<t_core> cryptonote_protocol_handler;
typedef CORE_SYNC_DATA payload_type; typedef CORE_SYNC_DATA payload_type;
t_cryptonote_protocol_handler(t_core& rcore, nodetool::i_p2p_endpoint<connection_context>* p_net_layout); t_cryptonote_protocol_handler(t_core& rcore, nodetool::i_p2p_endpoint<connection_context>* p_net_layout, bool offline = false);
BEGIN_INVOKE_MAP2(cryptonote_protocol_handler) BEGIN_INVOKE_MAP2(cryptonote_protocol_handler)
HANDLE_NOTIFY_T2(NOTIFY_NEW_BLOCK, &cryptonote_protocol_handler::handle_notify_new_block) HANDLE_NOTIFY_T2(NOTIFY_NEW_BLOCK, &cryptonote_protocol_handler::handle_notify_new_block)

4
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -61,10 +61,10 @@ namespace cryptonote
//----------------------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------------------
template<class t_core> template<class t_core>
t_cryptonote_protocol_handler<t_core>::t_cryptonote_protocol_handler(t_core& rcore, nodetool::i_p2p_endpoint<connection_context>* p_net_layout):m_core(rcore), t_cryptonote_protocol_handler<t_core>::t_cryptonote_protocol_handler(t_core& rcore, nodetool::i_p2p_endpoint<connection_context>* p_net_layout, bool offline):m_core(rcore),
m_p2p(p_net_layout), m_p2p(p_net_layout),
m_syncronized_connections_count(0), m_syncronized_connections_count(0),
m_synchronized(false), m_synchronized(offline),
m_stopping(false) m_stopping(false)
{ {

2
src/daemon/daemon.cpp
View File

@ -68,7 +68,7 @@ public:
boost::program_options::variables_map const & vm boost::program_options::variables_map const & vm
) )
: core{vm} : core{vm}
, protocol{vm, core} , protocol{vm, core, command_line::get_arg(vm, cryptonote::arg_offline)}
, p2p{vm, protocol} , p2p{vm, protocol}
{ {
// Handle circular dependencies // Handle circular dependencies

4
src/daemon/protocol.h
View File

@ -46,9 +46,9 @@ private:
public: public:
t_protocol( t_protocol(
boost::program_options::variables_map const & vm boost::program_options::variables_map const & vm
, t_core & core , t_core & core, bool offline = false
) )
: m_protocol{core.get(), nullptr} : m_protocol{core.get(), nullptr, offline}
{ {
MGINFO("Initializing cryptonote protocol..."); MGINFO("Initializing cryptonote protocol...");
if (!m_protocol.init(vm)) if (!m_protocol.init(vm))