[icinga-checkins] icinga.org: icinga2/master: ConfigCompiler should not log included files by default

git at icinga.org git at icinga.org
Tue Jul 5 15:44:53 CEST 2016


Module: icinga2
Branch: master
Commit: 915ebe17cdfdc62d5e72deb77db6ad63803ac9f6
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=915ebe17cdfdc62d5e72deb77db6ad63803ac9f6

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Tue Jul  5 15:43:48 2016 +0200

ConfigCompiler should not log included files by default

fixes #11419

---

 lib/base/loader.cpp           |    2 +-
 lib/cli/daemoncommand.cpp     |    2 ++
 lib/config/configcompiler.cpp |    2 +-
 lib/config/configitem.cpp     |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/base/loader.cpp b/lib/base/loader.cpp
index d51f669..a34ce8c 100644
--- a/lib/base/loader.cpp
+++ b/lib/base/loader.cpp
@@ -40,7 +40,7 @@ void Loader::LoadExtensionLibrary(const String& library)
 	path = "lib" + library + ".so";
 #endif /* _WIN32 */
 
-	Log(LogInformation, "Utility")
+	Log(LogNotice, "Loader")
 	    << "Loading library '" << path << "'";
 
 #ifdef _WIN32
diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 54bdda4..9463f11 100644
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -239,6 +239,8 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 	else if (!vm.count("no-config"))
 		configs.push_back(Application::GetSysconfDir() + "/icinga2/icinga2.conf");
 
+	Log(LogInformation, "cli", "Loading configuration file(s).");
+
 	std::vector<ConfigItem::Ptr> newItems;
 
 	if (!DaemonUtility::LoadConfigFiles(configs, newItems, Application::GetObjectsPath(), Application::GetVarsPath()))
diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 209b1bd..099f651 100644
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -280,7 +280,7 @@ Expression *ConfigCompiler::CompileFile(const String& path, const String& zone,
 			<< boost::errinfo_errno(errno)
 			<< boost::errinfo_file_name(path));
 
-	Log(LogInformation, "ConfigCompiler")
+	Log(LogNotice, "ConfigCompiler")
 	    << "Compiling config file: " << path;
 
 	return CompileStream(path, &stream, zone, package);
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 711585d..8c8370e 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -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)
 {
-	Log(LogInformation, "ConfigItem", "Committing config items");
+	Log(LogInformation, "ConfigItem", "Committing config item(s).");
 
 	if (!CommitNewItems(context, upq, newItems)) {
 		upq.ReportExceptions("config");



More information about the icinga-checkins mailing list