tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace two-variants enum with bool

This commit is contained in:
Alexander A. Klimov 2022-10-07 15:14:33 +02:00
parent 22bfcf9ac5
commit 61f7e029cb
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/cli/daemoncommand.cpp
View File

@ -324,15 +324,6 @@ int RunWorker(const std::vector<std::string>& configs, bool closeConsoleLog = fa
}
#ifndef _WIN32
/**
* The possible states of a seamless worker being started by StartUnixWorker().
*/
enum class UnixWorkerState : uint_fast8_t
{
Pending,
LoadedConfig
};
// The signals to block temporarily in StartUnixWorker().
static const sigset_t l_UnixWorkerSignals = ([]() -> sigset_t {
sigset_t s;
@ -351,7 +342,7 @@ static const sigset_t l_UnixWorkerSignals = ([]() -> sigset_t {
static Atomic<pid_t> l_CurrentlyStartingUnixWorkerPid (-1);
// The state of the seamless worker currently being started by StartUnixWorker()
static Atomic<UnixWorkerState> l_CurrentlyStartingUnixWorkerState (UnixWorkerState::Pending);
static Atomic<bool> l_CurrentlyStartingUnixWorkerReady (false);
// The last temination signal we received
static Atomic<int> l_TermSignal (-1);
@ -373,10 +364,10 @@ static void UmbrellaSignalHandler(int num, siginfo_t *info, void*)
l_RequestedReopenLogs.store(true);
break;
case SIGUSR2:
if (l_CurrentlyStartingUnixWorkerState.load() == UnixWorkerState::Pending
if (!l_CurrentlyStartingUnixWorkerReady.load()
&& (info->si_pid == 0 || info->si_pid == l_CurrentlyStartingUnixWorkerPid.load()) ) {
// The seamless worker currently being started by StartUnixWorker() successfully loaded its config
l_CurrentlyStartingUnixWorkerState.store(UnixWorkerState::LoadedConfig);
l_CurrentlyStartingUnixWorkerReady.store(true);
}
break;
case SIGINT:
@ -568,7 +559,7 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool close
break;
}
if (l_CurrentlyStartingUnixWorkerState.load() == UnixWorkerState::LoadedConfig) {
if (l_CurrentlyStartingUnixWorkerReady.load()) {
Log(LogNotice, "cli")
<< "Worker process successfully loaded its config";
break;
@ -579,7 +570,7 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool close
// Reset flags for the next time
l_CurrentlyStartingUnixWorkerPid.store(-1);
l_CurrentlyStartingUnixWorkerState.store(UnixWorkerState::Pending);
l_CurrentlyStartingUnixWorkerReady.store(false);
try {
Application::InitializeBase();