Skip to content

Commit

Permalink
[fix] Make signal handler optional
Browse files Browse the repository at this point in the history
  • Loading branch information
NRizzoInc committed Dec 19, 2020
1 parent 0f5f979 commit 3945251
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
19 changes: 19 additions & 0 deletions include/crow/app.h
Expand Up @@ -82,6 +82,18 @@ namespace crow
return router_.new_rule_tagged<Tag>(std::move(rule));
}

self_t& signal_clear()
{
signals_.clear();
return *this;
}

self_t& signal_add(int signal_number)
{
signals_.push_back(signal_number);
return *this;
}

///Set the port that Crow will handle requests on
self_t& port(std::uint16_t port)
{
Expand Down Expand Up @@ -191,6 +203,11 @@ namespace crow
{
server_ = std::move(std::unique_ptr<server_t>(new server_t(this, bindaddr_, port_, server_name_, &middlewares_, concurrency_, nullptr)));
server_->set_tick_function(tick_interval_, tick_function_);
server_->signal_clear();
for (auto snum : signals_)
{
server_->signal_add(snum);
}
notify_server_start();
server_->run();
}
Expand Down Expand Up @@ -332,6 +349,8 @@ namespace crow
#endif
std::unique_ptr<server_t> server_;

std::vector<int> signals_{SIGINT, SIGTERM};

bool server_started_{false};
std::condition_variable cv_started_;
std::mutex start_mutex_;
Expand Down
10 changes: 10 additions & 0 deletions include/crow/http_server.h
Expand Up @@ -173,6 +173,16 @@ namespace crow
io_service->stop();
}

void signal_clear()
{
signals_.clear();
}

void signal_add(int signal_number)
{
signals_.add(signal_number);
}

private:
asio::io_service& pick_io_service()
{
Expand Down

0 comments on commit 3945251

Please sign in to comment.