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

Don't validate config items if we've already encountered an error.

This commit is contained in:
Gunnar Beutner 2013-03-15 11:18:02 +01:00
parent 4e7c43c8c8
commit beeddb6840
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icinga-app/icinga.cpp
View File

@ -49,15 +49,26 @@ static bool LoadConfigFiles(bool validateOnly)
} }
String name, fragment; String name, fragment;
BOOST_FOREACH(tie(name, fragment), ConfigCompiler::GetConfigFragments()) { BOOST_FOREACH(tie(name, fragment), ConfigFragmentRegistry::GetInstance()->GetItems()) {
ConfigCompiler::CompileText(name, fragment); ConfigCompiler::CompileText(name, fragment);
} }
ConfigCompilerContext::SetContext(NULL); ConfigCompilerContext::SetContext(NULL);
bool hasError = false;
BOOST_FOREACH(const ConfigCompilerError& error, context.GetErrors()) {
if (!error.Warning) {
hasError = true;
break;
}
}
/* Don't validate if we have already encountered at least one error. */
if (!hasError)
context.Validate(); context.Validate();
bool hasError = false; hasError = false;
BOOST_FOREACH(const ConfigCompilerError& error, context.GetErrors()) { BOOST_FOREACH(const ConfigCompilerError& error, context.GetErrors()) {
if (error.Warning) { if (error.Warning) {