Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle signals during plugin_initialize #39

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Handle signals during plugin_initialize #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f2a9e6
Handle signals during plugin_initialize. No longer handle SIGHUP duri…
heifner Jan 27, 2025
bbd74cc
Update comment
heifner Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions application_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,16 @@ void application_base::wait_for_signal(std::shared_ptr<boost::asio::signal_set>
});
}

std::shared_ptr<boost::asio::signal_set> application_base::setup_signal_handling_on_ioc(boost::asio::io_context& io_ctx, bool include_sighup) {
std::shared_ptr<boost::asio::signal_set> application_base::setup_signal_handling_on_ioc(boost::asio::io_context& io_ctx) {
std::shared_ptr<boost::asio::signal_set> ss = std::make_shared<boost::asio::signal_set>(io_ctx, SIGINT, SIGTERM);
#ifdef SIGPIPE
ss->add(SIGPIPE);
#endif
#ifdef SIGHUP
if( include_sighup ) {
ss->add(SIGHUP);
}
#endif
wait_for_signal(ss);
return ss;
}

void application_base::startup(boost::asio::io_context& io_ctx) {
// setup handling of SIGINT/SIGTERM/SIGPIPE/SIGHUP during startup
auto ss = setup_signal_handling_on_ioc(my->_signal_catching_io_ctx, true);

try {
for( auto plugin : initialized_plugins ) {
if( is_quiting() ) break;
Expand All @@ -180,11 +172,6 @@ void application_base::startup(boost::asio::io_context& io_ctx) {
throw;
}

//after startup, move SIGHUP handling to main thread
boost::system::error_code ec;
ss->cancel(ec);
setup_signal_handling_on_ioc(my->_signal_catching_io_ctx, false);

#ifdef SIGHUP
std::shared_ptr<boost::asio::signal_set> sighup_set(new boost::asio::signal_set(io_ctx, SIGHUP));
start_sighup_handler( sighup_set );
Expand Down Expand Up @@ -386,6 +373,9 @@ bool application_base::initialize_impl(int argc, char** argv, vector<abstract_pl
std::string plugin_name;
auto error_header = [&]() { return std::string("appbase: exception thrown during plugin \"") + plugin_name + "\" initialization.\n"; };

// setup handling of SIGINT/SIGTERM/SIGPIPE during initialize
auto ss = setup_signal_handling_on_ioc(my->_signal_catching_io_ctx);

try {
if(options.count("plugin") > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion include/appbase/application_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ class application_base {
void print_default_config(std::ostream& os);

void wait_for_signal(std::shared_ptr<boost::asio::signal_set> ss);
std::shared_ptr<boost::asio::signal_set> setup_signal_handling_on_ioc(boost::asio::io_context& io_ctx, bool include_sighup);
std::shared_ptr<boost::asio::signal_set> setup_signal_handling_on_ioc(boost::asio::io_context& io_ctx);

void handle_exception(std::exception_ptr eptr, std::string_view origin);
};
Expand Down