From 0ddddc5ee2a3eccc0cd553e1fc6cece6a756f70b Mon Sep 17 00:00:00 2001 From: Iris Morelle Date: Mon, 16 Apr 2018 23:33:17 -0300 Subject: [PATCH] campaignd: Add 'delete' control FIFO command (cherry-picked from commit 0475c349b801643a18372bb810ab0b6f4fd97fe8) --- src/campaign_server/campaign_server.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/campaign_server/campaign_server.cpp b/src/campaign_server/campaign_server.cpp index 2b0b240cfddb..feb70db1e061 100644 --- a/src/campaign_server/campaign_server.cpp +++ b/src/campaign_server/campaign_server.cpp @@ -297,6 +297,15 @@ void server::handle_read_from_fifo(const boost::system::error_code& error, std:: load_config(); LOG_CS << "Reloaded configuration\n"; } + } else if(ctl == "delete") { + if(ctl.args_count() != 1) { + ERR_CS << "Incorrect number of arguments for 'delete'\n"; + } else { + const std::string& addon_id = ctl[1]; + + LOG_CS << "deleting add-on '" << addon_id << "' requested from control FIFO\n"; + delete_campaign(addon_id); + } } else if(ctl == "setpass") { if(ctl.args_count() != 2) { ERR_CS << "Incorrect number of arguments for 'setpass'\n"; @@ -530,6 +539,8 @@ void server::delete_campaign(const std::string& id) write_config(); fire("hook_post_erase", id); + + LOG_CS << "Deleted add-on '" << id << "'\n"; } #define REGISTER_CAMPAIGND_HANDLER(req_id) \