aboutsummaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-10-04 11:41:41 +0200
committerRiccardo Spagni <ric@spagni.net>2016-10-04 11:41:41 +0200
commite34ef4de6c99de3d057901feabe4d38e1fde4a39 (patch)
tree444079a995edddb208419f902d0d124463d3071e /src/daemon
parentMerge pull request #1168 (diff)
parentRemoved all code related to fast_exit (diff)
downloadmonero-e34ef4de6c99de3d057901feabe4d38e1fde4a39.tar.xz
Merge pull request #1171
6390673 Removed all code related to fast_exit (NanoAkron)
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/command_parser_executor.cpp6
-rw-r--r--src/daemon/command_parser_executor.h2
-rw-r--r--src/daemon/command_server.cpp5
-rw-r--r--src/daemon/rpc_command_executor.cpp28
-rw-r--r--src/daemon/rpc_command_executor.h2
5 files changed, 0 insertions, 43 deletions
diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp
index 83892c661..6ea862b56 100644
--- a/src/daemon/command_parser_executor.cpp
+++ b/src/daemon/command_parser_executor.cpp
@@ -336,12 +336,6 @@ bool t_command_parser_executor::set_limit_down(const std::vector<std::string>& a
return m_executor.set_limit_down(limit);
}
-bool t_command_parser_executor::fast_exit(const std::vector<std::string>& args)
-{
- if (!args.empty()) return false;
- return m_executor.fast_exit();
-}
-
bool t_command_parser_executor::out_peers(const std::vector<std::string>& args)
{
if (args.empty()) return false;
diff --git a/src/daemon/command_parser_executor.h b/src/daemon/command_parser_executor.h
index e59f51cdb..7819bd261 100644
--- a/src/daemon/command_parser_executor.h
+++ b/src/daemon/command_parser_executor.h
@@ -98,8 +98,6 @@ public:
bool set_limit_down(const std::vector<std::string>& args);
- bool fast_exit(const std::vector<std::string>& args);
-
bool out_peers(const std::vector<std::string>& args);
bool start_save_graph(const std::vector<std::string>& args);
diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp
index 2c3c54841..cb54d1966 100644
--- a/src/daemon/command_server.cpp
+++ b/src/daemon/command_server.cpp
@@ -171,11 +171,6 @@ t_command_server::t_command_server(
, "limit <kB/s> - Set download limit"
);
m_command_lookup.set_handler(
- "fast_exit"
- , std::bind(&t_command_parser_executor::fast_exit, &m_parser, p::_1)
- , "Exit"
- );
- m_command_lookup.set_handler(
"out_peers"
, std::bind(&t_command_parser_executor::out_peers, &m_parser, p::_1)
, "Set max number of out peers"
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 85d8c0c4d..2289bf37d 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -989,34 +989,6 @@ bool t_rpc_command_executor::set_limit_down(int limit)
return true;
}
-bool t_rpc_command_executor::fast_exit()
-{
- cryptonote::COMMAND_RPC_FAST_EXIT::request req;
- cryptonote::COMMAND_RPC_FAST_EXIT::response res;
-
- std::string fail_message = "Daemon did not stop";
-
- if (m_is_rpc)
- {
- if (!m_rpc_client->rpc_request(req, res, "/fast_exit", fail_message.c_str()))
- {
- return true;
- }
- }
-
- else
- {
- if (!m_rpc_server->on_fast_exit(req, res) || res.status != CORE_RPC_STATUS_OK)
- {
- tools::fail_msg_writer() << fail_message.c_str();
- return true;
- }
- }
-
- tools::success_msg_writer() << "Daemon stopped";
- return true;
-}
-
bool t_rpc_command_executor::out_peers(uint64_t limit)
{
cryptonote::COMMAND_RPC_OUT_PEERS::request req;
diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h
index afb2b5f36..5eed44353 100644
--- a/src/daemon/rpc_command_executor.h
+++ b/src/daemon/rpc_command_executor.h
@@ -116,8 +116,6 @@ public:
bool set_limit_down(int limit);
- bool fast_exit();
-
bool out_peers(uint64_t limit);
bool start_save_graph();