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

ConfigCompiler should not log included files by default 

fixes #11419
This commit is contained in:
Michael Friedrich 2016-07-05 15:43:48 +02:00
parent 5836b5b868
commit 915ebe17cd
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/loader.cpp
View File

@ -40,7 +40,7 @@ void Loader::LoadExtensionLibrary(const String& library)
path = "lib" + library + ".so"; path = "lib" + library + ".so";
#endif /* _WIN32 */ #endif /* _WIN32 */
Log(LogInformation, "Utility") Log(LogNotice, "Loader")
<< "Loading library '" << path << "'"; << "Loading library '" << path << "'";
#ifdef _WIN32 #ifdef _WIN32

2
lib/cli/daemoncommand.cpp
View File

@ -239,6 +239,8 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
else if (!vm.count("no-config")) else if (!vm.count("no-config"))
configs.push_back(Application::GetSysconfDir() + "/icinga2/icinga2.conf"); configs.push_back(Application::GetSysconfDir() + "/icinga2/icinga2.conf");
Log(LogInformation, "cli", "Loading configuration file(s).");
std::vector<ConfigItem::Ptr> newItems; std::vector<ConfigItem::Ptr> newItems;
if (!DaemonUtility::LoadConfigFiles(configs, newItems, Application::GetObjectsPath(), Application::GetVarsPath())) if (!DaemonUtility::LoadConfigFiles(configs, newItems, Application::GetObjectsPath(), Application::GetVarsPath()))

2
lib/config/configcompiler.cpp
View File

@ -280,7 +280,7 @@ Expression *ConfigCompiler::CompileFile(const String& path, const String& zone,
<< boost::errinfo_errno(errno) << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(path)); << boost::errinfo_file_name(path));
Log(LogInformation, "ConfigCompiler") Log(LogNotice, "ConfigCompiler")
<< "Compiling config file: " << path; << "Compiling config file: " << path;
return CompileStream(path, &stream, zone, package); return CompileStream(path, &stream, zone, package);

2
lib/config/configitem.cpp
View File

@ -534,7 +534,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems) bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems)
{ {
Log(LogInformation, "ConfigItem", "Committing config items"); Log(LogInformation, "ConfigItem", "Committing config item(s).");
if (!CommitNewItems(context, upq, newItems)) { if (!CommitNewItems(context, upq, newItems)) {
upq.ReportExceptions("config"); upq.ReportExceptions("config");