From 35b160edea51492c9f98b59f7e175490c7cc2590 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 3 Jun 2015 22:42:30 +0100 Subject: fix ^D exit for bitmonerod It uses the async console handler differently than simplewallet, and wasn't running the same exit code, causing it to never actually exit after breaking out of the console entry loop. --- src/daemon/command_server.cpp | 4 ++-- src/daemon/command_server.h | 2 +- src/daemon/daemon.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp index 5510ee594..65bceff75 100644 --- a/src/daemon/command_server.cpp +++ b/src/daemon/command_server.cpp @@ -196,11 +196,11 @@ bool t_command_server::process_command_vec(const std::vector& cmd) return result; } -bool t_command_server::start_handling() +bool t_command_server::start_handling(std::function exit_handler) { if (m_is_rpc) return false; - m_command_lookup.start_handling("", get_commands_str()); + m_command_lookup.start_handling("", get_commands_str(), exit_handler); return true; } diff --git a/src/daemon/command_server.h b/src/daemon/command_server.h index aa8e0770e..5df457288 100644 --- a/src/daemon/command_server.h +++ b/src/daemon/command_server.h @@ -62,7 +62,7 @@ public: bool process_command_vec(const std::vector& cmd); - bool start_handling(); + bool start_handling(std::function exit_handler = NULL); void stop_handling(); diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 7931ba03f..2bd592611 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -126,7 +126,7 @@ bool t_daemon::run(bool interactive) if (interactive) { rpc_commands = new daemonize::t_command_server(0, 0, false, mp_internals->rpc.get_server()); - rpc_commands->start_handling(); + rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop, this)); } mp_internals->p2p.run(); // blocks until p2p goes down -- cgit v1.2.3