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

Make config error messages friendler. 

Refs #5825
This commit is contained in:
Gunnar Beutner 2014-03-21 15:58:13 +01:00
parent c286c25183
commit c0b10a8245
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icinga-app/icinga.cpp
View File

@ -64,8 +64,6 @@ static String LoadAppType(const String& typeSpec)
static bool LoadConfigFiles(const String& appType, ValidationType validate) static bool LoadConfigFiles(const String& appType, ValidationType validate)
{ {
CONTEXT("Loading configuration files");
ConfigCompilerContext::GetInstance()->Reset(); ConfigCompilerContext::GetInstance()->Reset();
if (g_AppParams.count("config") > 0) { if (g_AppParams.count("config") > 0) {

2
lib/config/config_parser.yy
View File

@ -191,7 +191,7 @@ void ConfigCompiler::Compile(void)
yyparse(this); yyparse(this);
} catch (const ConfigError& ex) { } catch (const ConfigError& ex) {
ShowCodeFragment(std::cout, ex.GetDebugInfo()); ShowCodeFragment(std::cout, ex.GetDebugInfo());
ConfigCompilerContext::GetInstance()->AddMessage(true, DiagnosticInformation(ex)); ConfigCompilerContext::GetInstance()->AddMessage(true, ex.what());
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
ConfigCompilerContext::GetInstance()->AddMessage(true, DiagnosticInformation(ex)); ConfigCompilerContext::GetInstance()->AddMessage(true, DiagnosticInformation(ex));
} }