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

Improve error message on missing included config files 

fixes #8179
This commit is contained in:
Michael Friedrich 2015-02-07 21:50:14 +01:00
parent a1f04992f3
commit 29093f2a2f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/configcompiler.cpp
View File

@ -134,8 +134,8 @@ Expression *ConfigCompiler::HandleInclude(const String& include, bool search, co
if (!Utility::Glob(includePath, boost::bind(&ConfigCompiler::CollectIncludes, boost::ref(expressions), _1, m_Zone), GlobFile) && includePath.FindFirstOf("*?") == String::NPos) { if (!Utility::Glob(includePath, boost::bind(&ConfigCompiler::CollectIncludes, boost::ref(expressions), _1, m_Zone), GlobFile) && includePath.FindFirstOf("*?") == String::NPos) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Include file '" + include + "' does not exist: " << debuginfo; msgbuf << "Include file '" + include + "' does not exist";
BOOST_THROW_EXCEPTION(std::invalid_argument(msgbuf.str())); BOOST_THROW_EXCEPTION(ScriptError(msgbuf.str(), debuginfo));
} }
DictExpression *expr = new DictExpression(expressions); DictExpression *expr = new DictExpression(expressions);