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

Fix crash in ConfigItem::Commit 

fixes #11804
This commit is contained in:
Gunnar Beutner 2016-05-18 12:53:41 +02:00
parent eadd61c7e4
commit 9687e27c38
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/config/configitem.cpp
View File

@ -194,7 +194,10 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
Log(LogNotice, "ConfigObject") Log(LogNotice, "ConfigObject")
<< "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex); << "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex);
m_IgnoredItems.push_back(m_DebugInfo.Path); {
boost::mutex::scoped_lock lock(m_Mutex);
m_IgnoredItems.push_back(m_DebugInfo.Path);
}
return ConfigObject::Ptr(); return ConfigObject::Ptr();
} }
@ -243,7 +246,10 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
Log(LogNotice, "ConfigObject") Log(LogNotice, "ConfigObject")
<< "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex); << "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex);
m_IgnoredItems.push_back(m_DebugInfo.Path); {
boost::mutex::scoped_lock lock(m_Mutex);
m_IgnoredItems.push_back(m_DebugInfo.Path);
}
return ConfigObject::Ptr(); return ConfigObject::Ptr();
} }
@ -259,7 +265,10 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
Log(LogNotice, "ConfigObject") Log(LogNotice, "ConfigObject")
<< "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex); << "Ignoring config object '" << m_Name << "' of type '" << m_Type << "' due to errors: " << DiagnosticInformation(ex);
m_IgnoredItems.push_back(m_DebugInfo.Path); {
boost::mutex::scoped_lock lock(m_Mutex);
m_IgnoredItems.push_back(m_DebugInfo.Path);
}
return ConfigObject::Ptr(); return ConfigObject::Ptr();
} }
@ -374,7 +383,10 @@ void ConfigItem::OnAllConfigLoadedHelper(void)
Unregister(); Unregister();
m_IgnoredItems.push_back(m_DebugInfo.Path); {
boost::mutex::scoped_lock lock(m_Mutex);
m_IgnoredItems.push_back(m_DebugInfo.Path);
}
return; return;
} }
@ -645,6 +657,8 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type)
void ConfigItem::RemoveIgnoredItems(const String& allowedConfigPath) void ConfigItem::RemoveIgnoredItems(const String& allowedConfigPath)
{ {
boost::mutex::scoped_lock lock(m_Mutex);
BOOST_FOREACH(const String& path, m_IgnoredItems) { BOOST_FOREACH(const String& path, m_IgnoredItems) {
if (path.Find(allowedConfigPath) == String::NPos) if (path.Find(allowedConfigPath) == String::NPos)
continue; continue;