tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 21:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing log messages

Browse Source 
refs #5230
This commit is contained in:
Alexander A. Klimov 2019-07-15 18:29:15 +02:00
parent ac29b3b93a
commit 3584ad97d8
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/application.cpp
View File

@ -305,6 +305,8 @@ void Application::RunEventLoop()
m_ReloadProcess = StartReloadProcess(); m_ReloadProcess = StartReloadProcess();
} }
#else /* _WIN32 */ #else /* _WIN32 */
Log(LogNotice, "Application") << "Got reload command, forwarding to umbrella process (PID " << m_UmbrellaProcess << ")";
(void)kill(m_UmbrellaProcess, SIGHUP); (void)kill(m_UmbrellaProcess, SIGHUP);
#endif /* _WIN32 */ #endif /* _WIN32 */
} else { } else {

37
lib/cli/daemoncommand.cpp
View File

@ -198,12 +198,17 @@ int RunWorker(const std::vector<std::string>& configs)
return EXIT_FAILURE; return EXIT_FAILURE;
#ifndef _WIN32 #ifndef _WIN32
// Notify umbrella process about the config loading success. Log(LogNotice, "cli") << "Notifying umbrella process (PID " << l_UmbrellaPid << ") about the config loading success";
(void)kill(l_UmbrellaPid, SIGUSR2); (void)kill(l_UmbrellaPid, SIGUSR2);
Log(LogNotice, "cli") << "Waiting for the umbrella process to let us doing the actual work";
while (!l_AllowedToWork.load()) { while (!l_AllowedToWork.load()) {
Utility::Sleep(0.2); Utility::Sleep(0.2);
} }
Log(LogNotice, "cli") << "The umbrella process let us continuing";
#endif /* _WIN32 */ #endif /* _WIN32 */
/* restore the previous program state */ /* restore the previous program state */
@ -339,6 +344,8 @@ static void NotifyWatchdog()
static pid_t StartUnixWorker(const std::vector<std::string>& configs) static pid_t StartUnixWorker(const std::vector<std::string>& configs)
{ {
Log(LogNotice, "cli") << "Spawning seemless worker process doing the actual work";
try { try {
Application::UninitializeBase(); Application::UninitializeBase();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
@ -400,6 +407,8 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs)
l_CurrentlyStartingUnixWorkerPid.store(pid); l_CurrentlyStartingUnixWorkerPid.store(pid);
(void)sigprocmask(SIG_UNBLOCK, &l_UnixWorkerSignals, nullptr); (void)sigprocmask(SIG_UNBLOCK, &l_UnixWorkerSignals, nullptr);
Log(LogNotice, "cli") << "Spawned worker process (PID " << pid << "), waiting for it to load its config";
for (;;) { for (;;) {
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
NotifyWatchdog(); NotifyWatchdog();
@ -407,8 +416,11 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs)
switch (l_CurrentlyStartingUnixWorkerState.load()) { switch (l_CurrentlyStartingUnixWorkerState.load()) {
case UnixWorkerState::LoadedConfig: case UnixWorkerState::LoadedConfig:
Log(LogNotice, "cli") << "Worker process successfully loaded its config";
break; break;
case UnixWorkerState::Failed: case UnixWorkerState::Failed:
Log(LogNotice, "cli") << "Worker process couldn't load its config";
while (waitpid(pid, nullptr, 0) == -1 && errno == EINTR) { while (waitpid(pid, nullptr, 0) == -1 && errno == EINTR) {
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
NotifyWatchdog(); NotifyWatchdog();
@ -573,6 +585,8 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
if (!requestedTermination) { if (!requestedTermination) {
int termSig = l_TermSignal.load(); int termSig = l_TermSignal.load();
if (termSig != -1) { if (termSig != -1) {
Log(LogNotice, "cli") << "Got signal " << termSig << ", forwarding to seemless worker (PID " << currentWorker << ")";
(void)kill(currentWorker, termSig); (void)kill(currentWorker, termSig);
requestedTermination = true; requestedTermination = true;
@ -586,18 +600,31 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
} }
if (l_RequestedReload.exchange(false)) { if (l_RequestedReload.exchange(false)) {
Log(LogInformation, "Application") << "Got reload command: Starting new instance.";
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
sd_notify(0, "RELOADING=1"); sd_notify(0, "RELOADING=1");
#endif /* HAVE_SYSTEMD */ #endif /* HAVE_SYSTEMD */
pid_t nextWorker = StartUnixWorker(configs); pid_t nextWorker = StartUnixWorker(configs);
if (nextWorker != -1) { if (nextWorker == -1) {
Log(LogCritical, "Application", "Found error in config: reloading aborted");
} else {
Log(LogInformation, "Application") << "Reload done, old process shutting down. Child process with PID '" << nextWorker << "' is taking over.";
(void)kill(currentWorker, SIGTERM); (void)kill(currentWorker, SIGTERM);
while (waitpid(currentWorker, nullptr, 0) == -1 && errno == EINTR) {
{
double start = Utility::GetTime();
while (waitpid(currentWorker, nullptr, 0) == -1 && errno == EINTR) {
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
NotifyWatchdog(); NotifyWatchdog();
#endif /* HAVE_SYSTEMD */ #endif /* HAVE_SYSTEMD */
}
Log(LogNotice, "cli") << "Waited for " << Utility::FormatDuration(Utility::GetTime() - start) << " on old process to exit.";
} }
(void)kill(nextWorker, SIGUSR2); (void)kill(nextWorker, SIGUSR2);
@ -614,6 +641,8 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
{ {
int status; int status;
if (waitpid(currentWorker, &status, WNOHANG) > 0) { if (waitpid(currentWorker, &status, WNOHANG) > 0) {
Log(LogNotice, "cli") << "Seemless worker (PID " << currentWorker << ") stopped, stopping as well";
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
if (!notifiedTermination) { if (!notifiedTermination) {
notifiedTermination = true; notifiedTermination = true;