tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 17:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8777 from Icinga/bugfix/runworker-exceptions-2.12

Browse Source 
Improve handling of exceptions thrown by RunWorker (2.12)
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-05-26 16:44:54 +02:00 committed by GitHub
commit 6ceba45739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cli/daemoncommand.cpp
View File

@ -518,6 +518,9 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool close
}
_exit(RunWorker(configs, closeConsoleLog, stderrFile));
} catch (const std::exception& ex) {
Log(LogCritical, "cli") << "Exception in main process: " << DiagnosticInformation(ex);
_exit(EXIT_FAILURE);
} catch (...) {
_exit(EXIT_FAILURE);
}
@ -680,7 +683,14 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
}
#ifdef _WIN32
return RunWorker(configs);
try {
return RunWorker(configs);
} catch (const std::exception& ex) {
Log(LogCritical, "cli") << "Exception in main process: " << DiagnosticInformation(ex);
return EXIT_FAILURE;
} catch (...) {
return EXIT_FAILURE;
}
#else /* _WIN32 */
l_UmbrellaPid = getpid();
Application::SetUmbrellaProcess(l_UmbrellaPid);