0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

campaignd: Reload configuration on SIGHUP

Browse source 
It's a bit tricky right now because whoever changes the configuration
must make sure to do it within the flush interval or their changes may
be lost before they get to send SIGHUP to campaignd. Another issue is
that the campaigns list may change (new uploads, bumped download counts,
etc.) between editing the config file and sending SIGHUP, and any
changes in the on-memory version of the list will be irreversibly lost.

Hopefully soon I'll add some socket commands to address these
limitations.
This commit is contained in:
Ignacio R. Morelle 2015-04-19 21:56:45 -03:00
parent dbeef1c9a5
commit 1cb3d67756
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/campaign_server/campaign_server.cpp
View file

@ -61,11 +61,17 @@ static lg::log_domain log_campaignd("campaignd");
namespace {
void exit_sighup(int signal)
/**
* Whether to reload the server configuration as soon as possible
* (e.g. after SIGHUP).
*/
sig_atomic_t need_reload = 0;
void flag_sighup(int signal)
{
assert(signal == SIGHUP);
LOG_CS << "SIGHUP caught, exiting without cleanup immediately.\n";
exit(128 + SIGHUP);
LOG_CS << "SIGHUP caught, scheduling config reload.\n";
need_reload = 1;
}
void exit_sigint(int signal)
@ -113,7 +119,7 @@ server::server(const std::string& cfg_file, size_t min_threads, size_t max_threa
, server_manager_(load_config())
{
#ifndef _MSC_VER
signal(SIGHUP, exit_sighup);
signal(SIGHUP, flag_sighup);
#endif
signal(SIGINT, exit_sigint);
signal(SIGTERM, exit_sigterm);
@ -268,6 +274,15 @@ void server::run()
for(;;)
{
if(need_reload) {
load_config(); // TODO: handle port number config changes
need_reload = 0;
last_ts = 0;
LOG_CS << "Reloaded configuration\n";
}
try {
std::string admin_cmd;