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

Fix an Icinga crash, improve a log message 

fixes #8227
This commit is contained in:
Jean Flach 2015-01-21 16:16:47 +01:00
parent 4245dc9cc3
commit b0483490c8
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icinga-app/icinga.cpp
View File

@ -256,7 +256,7 @@ int Main(void)
logLevel = Logger::StringToSeverity(severity); logLevel = Logger::StringToSeverity(severity);
} catch (std::exception&) { } catch (std::exception&) {
/* Inform user and exit */ /* Inform user and exit */
Log(LogCritical, "icinga", "Invalid log level set. Default is 'information'."); Log(LogCritical, "icinga-app", "Invalid log level set. Default is 'information'.");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -264,10 +264,26 @@ int Main(void)
} }
if (vm.count("library")) { if (vm.count("library")) {
BOOST_FOREACH(const String& libraryName, vm["library"].as<std::vector<std::string> >()) { BOOST_FOREACH(const String& libraryName, vm["library"].as<std::vector<std::string> >())
(void)Utility::LoadExtensionLibrary(libraryName); {
try {
(void)Utility::LoadExtensionLibrary(libraryName);
}
#ifdef _WIN32
catch (win32_error &ex) {
if (int const * err = boost::get_error_info<errinfo_win32_error>(ex)) {
Log(LogCritical, "icinga-app", "Could not load library \"" + libraryName + "\"");
exit(EXIT_FAILURE);
}
}
#else /*_WIN32*/
catch (std::runtime_error &ex) {
Log(LogCritical, "icinga-app", "Could not load library \"" + libraryName + "\"");
exit(EXIT_FAILURE);
}
#endif /*_WIN32*/
} }
} }
if (!command || vm.count("help") || vm.count("version")) { if (!command || vm.count("help") || vm.count("version")) {
String appName = Utility::BaseName(Application::GetArgV()[0]); String appName = Utility::BaseName(Application::GetArgV()[0]);