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

Merge pull request #6663 from Icinga/feature/silence-logging-runtime-object-creation 

Silence config compiler logging for runtime created objects
This commit is contained in:
Michael Friedrich 2018-10-09 17:10:21 +02:00 committed by GitHub
parent e6eb703b36 85e161ea1e
commit 13c75b7113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/applyrule.cpp
View File

@ -158,11 +158,11 @@ std::vector<ApplyRule>& ApplyRule::GetRules(const String& type)
return it->second;
}
void ApplyRule::CheckMatches()
void ApplyRule::CheckMatches(bool silent)
{
for (const RuleMap::value_type& kv : m_Rules) {
for (const ApplyRule& rule : kv.second) {
if (!rule.HasMatches())
if (!rule.HasMatches() && !silent)
Log(LogWarning, "ApplyRule")
<< "Apply rule '" << rule.GetName() << "' (" << rule.GetDebugInfo() << ") for type '" << kv.first << "' does not match anywhere!";
}

2
lib/config/applyrule.hpp
View File

@ -62,7 +62,7 @@ public:
static bool IsValidTargetType(const String& sourceType, const String& targetType);
static std::vector<String> GetTargetTypes(const String& sourceType);
static void CheckMatches();
static void CheckMatches(bool silent);
private:
String m_TargetType;

2
lib/config/configitem.cpp
View File

@ -618,7 +618,7 @@ bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& u
return false;
}
ApplyRule::CheckMatches();
ApplyRule::CheckMatches(silent);
if (!silent) {
/* log stats for external parsers */

7
lib/remote/configobjectutility.cpp
View File

@ -143,7 +143,8 @@ bool ConfigObjectUtility::CreateObject(const Type::Ptr& type, const String& full
std::vector<ConfigItem::Ptr> newItems;
if (!ConfigItem::CommitItems(ascope.GetContext(), upq, newItems) || !ConfigItem::ActivateItems(upq, newItems, true)) {
/* Disable logging for object creation, but do so ourselves later on. */
if (!ConfigItem::CommitItems(ascope.GetContext(), upq, newItems, true) || !ConfigItem::ActivateItems(upq, newItems, true, true)) {
if (errors) {
if (unlink(path.CStr()) < 0 && errno != ENOENT) {
BOOST_THROW_EXCEPTION(posix_error()
@ -164,6 +165,10 @@ bool ConfigObjectUtility::CreateObject(const Type::Ptr& type, const String& full
}
ApiListener::UpdateObjectAuthority();
Log(LogInformation, "ConfigObjectUtility")
<< "Created and activated object '" << fullName << "' of type '" << type->GetName() << "'.";
} catch (const std::exception& ex) {
if (unlink(path.CStr()) < 0 && errno != ENOENT) {
BOOST_THROW_EXCEPTION(posix_error()