tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing ->GetName() calls

Browse Source 
fixes #5256
This commit is contained in:
Gunnar Beutner 2017-05-15 11:10:09 +02:00
parent b1d54cd020
commit 7e3b664140
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/config/configitem.cpp
View File

@ -204,7 +204,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
if (m_IgnoreOnError) { if (m_IgnoreOnError) {
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->GetName() << "' due to errors: " << DiagnosticInformation(ex);
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
@ -256,7 +256,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
} catch (ValidationError& ex) { } catch (ValidationError& ex) {
if (m_IgnoreOnError) { if (m_IgnoreOnError) {
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->GetName() << "' due to errors: " << DiagnosticInformation(ex);
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
@ -275,7 +275,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
if (m_IgnoreOnError) { if (m_IgnoreOnError) {
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->GetName() << "' due to errors: " << DiagnosticInformation(ex);
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
@ -290,7 +290,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
Dictionary::Ptr persistentItem = new Dictionary(); Dictionary::Ptr persistentItem = new Dictionary();
persistentItem->Set("type", GetType()); persistentItem->Set("type", GetType()->GetName());
persistentItem->Set("name", GetName()); persistentItem->Set("name", GetName());
persistentItem->Set("properties", Serialize(dobj, FAConfig)); persistentItem->Set("properties", Serialize(dobj, FAConfig));
persistentItem->Set("debug_hints", dhint); persistentItem->Set("debug_hints", dhint);
@ -481,7 +481,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
if (item->m_IgnoreOnError) { if (item->m_IgnoreOnError) {
Log(LogNotice, "ConfigObject") Log(LogNotice, "ConfigObject")
<< "Ignoring config object '" << item->m_Name << "' of type '" << item->m_Type << "' due to errors: " << DiagnosticInformation(ex); << "Ignoring config object '" << item->m_Name << "' of type '" << item->m_Type->GetName() << "' due to errors: " << DiagnosticInformation(ex);
item->Unregister(); item->Unregister();