hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Generalized Util::Config::is_restarting for rolling restarts, added rolling restart support to listening socket outputs

Browse source
This commit is contained in:
Thulinma 2019-05-23 13:30:24 +02:00
parent 26c9f964be
commit 5418c1fefc
11 changed files with 74 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/output/mist_out.cpp
View file

@ -9,6 +9,12 @@ int spawnForked(Socket::Connection & S){
return tmp.run();
}
void handleUSR1(int signum, siginfo_t *sigInfo, void *ignore){
HIGH_MSG("USR1 received - triggering rolling restart");
Util::Config::is_restarting = true;
Util::Config::is_active = false;
}
int main(int argc, char * argv[]) {
Util::redirectLogsIfNeeded();
Util::Config conf(argv[0]);
@ -21,7 +27,19 @@ int main(int argc, char * argv[]) {
}
conf.activate();
if (mistOut::listenMode()){
{
struct sigaction new_action;
new_action.sa_sigaction = handleUSR1;
sigemptyset(&new_action.sa_mask);
new_action.sa_flags = 0;
sigaction(SIGUSR1, &new_action, NULL);
}
mistOut::listener(conf, spawnForked);
if (conf.is_restarting && Socket::checkTrueSocket(0)){
INFO_MSG("Reloading input while re-using server socket");
execvp(argv[0], argv);
FAIL_MSG("Error reloading: %s", strerror(errno));
}
}else{
Socket::Connection S(fileno(stdout),fileno(stdin) );
mistOut tmp(S);