From f9b361be8a32fec2cc6ef0f835e4b8077b713753 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 14 Jun 2015 00:30:04 +0100 Subject: [PATCH] daemon: fix an exit crash --- src/daemon/daemon.cpp | 11 ++++++++++- src/daemon/daemon.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 2bd59261..6a5943c8 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(std::bind(&daemonize::t_daemon::stop, this)); + rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this)); } mp_internals->p2p.run(); // blocks until p2p goes down @@ -163,4 +163,13 @@ void t_daemon::stop() mp_internals.reset(nullptr); // Ensure resources are cleaned up before we return } +void t_daemon::stop_p2p() +{ + if (nullptr == mp_internals) + { + throw std::runtime_error{"Can't send stop signal to a stopped daemon"}; + } + mp_internals->p2p.get().send_stop_signal(); +} + } // namespace daemonize diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h index 1a6a53d3..8ed2a2f0 100644 --- a/src/daemon/daemon.h +++ b/src/daemon/daemon.h @@ -38,6 +38,8 @@ class t_internals; class t_daemon final { public: static void init_options(boost::program_options::options_description & option_spec); +private: + void stop_p2p(); private: std::unique_ptr mp_internals; public: