ConfigCompiler should not log included files by default

fixes #11419

diff --git a/lib/base/loader.cpp b/lib/base/loader.cpp
index d51f66930737ae3aecbf00068eaf2cae5ee46ea5..a34ce8c3ea464191298b169d1f64e2b5dc2d0d29 100644 (file)
--- 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 54bdda4504780ca97e687cb554f6fe24d9caf52f..9463f11ef7012c7c7a5a350c4651e3cff77750c1 100644 (file)
--- 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 209b1bd9b10f2c9d0fe8af0e30ac6cc0c2677140..099f65153a1db7b00e29e76a43d09fc7e0e1317f 100644 (file)
--- 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 711585d34fa04af602e1f995928678a3ecfc14b5..8c8370e5ea866e7da05d1eb74542e2b0f6b6ac21 100644 (file)
--- 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");