diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:53 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:54 +0100 |
| commit | bdf0339dda929026cc4efef835be2c63bc1555a0 (patch) | |
| tree | 4ab603849e0a0c7a4c47fca22fa042b1254384cc /src/daemon | |
| parent | ba22928d4bc6516e3b10785fefa6735fafdd62d5 (diff) | |
| parent | e3f0980a1dc2608beee73086d2581d51f367b8b8 (diff) | |
| download | monzero-core-bdf0339dda929026cc4efef835be2c63bc1555a0.tar.gz monzero-core-bdf0339dda929026cc4efef835be2c63bc1555a0.tar.xz monzero-core-bdf0339dda929026cc4efef835be2c63bc1555a0.zip | |
Merge pull request #3181
e3f0980a daemon: don't drop RPC with busy error when running offline (moneromooo-monero)
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/protocol.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 2d662b7d3..9b15e62ca 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -68,7 +68,7 @@ public: boost::program_options::variables_map const & vm ) : core{vm} - , protocol{vm, core} + , protocol{vm, core, command_line::get_arg(vm, cryptonote::arg_offline)} , p2p{vm, protocol} { // Handle circular dependencies diff --git a/src/daemon/protocol.h b/src/daemon/protocol.h index a251ae47c..fd1d1b638 100644 --- a/src/daemon/protocol.h +++ b/src/daemon/protocol.h @@ -46,9 +46,9 @@ private: public: t_protocol( 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..."); if (!m_protocol.init(vm)) |