From: Michael Friedrich Date: Wed, 28 May 2014 12:34:26 +0000 (+0200) Subject: Change log message identifier for libdb_ido. X-Git-Tag: v2.0.0-beta2~64^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bfa068e466453a1f4825e9253d1d8e66af0b51d;p=icinga2 Change log message identifier for libdb_ido. Refs #6346 --- diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 751f56922..0b0455527 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -49,7 +49,7 @@ void DbConnection::Resume(void) { DynamicObject::Resume(); - Log(LogInformation, "db_ido", "Resuming IDO connection: " + GetName()); + Log(LogInformation, "DbConnection", "Resuming IDO connection: " + GetName()); m_CleanUpTimer = make_shared(); m_CleanUpTimer->SetInterval(60); @@ -61,7 +61,7 @@ void DbConnection::Pause(void) { DynamicObject::Pause(); - Log(LogInformation, "db_ido", "Pausing IDO connection: " + GetName()); + Log(LogInformation, "DbConnection", "Pausing IDO connection: " + GetName()); m_CleanUpTimer.reset(); @@ -141,13 +141,13 @@ void DbConnection::ProgramStatusHandler(void) if (!vars) return; - Log(LogDebug, "db_ido", "Dumping global vars for icinga application"); + Log(LogDebug, "DbConnection", "Dumping global vars for icinga application"); ObjectLock olock(vars); BOOST_FOREACH(const Dictionary::Pair& kv, vars) { if (!kv.first.IsEmpty()) { - Log(LogDebug, "db_ido", "icinga application customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + "'"); + Log(LogDebug, "DbConnection", "icinga application customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + "'"); Dictionary::Ptr fields4 = make_shared(); fields4->Set("varname", Convert::ToString(kv.first)); @@ -198,7 +198,7 @@ void DbConnection::CleanUpHandler(void) continue; CleanUpExecuteQuery(tables[i].name, tables[i].time_column, now - max_age); - Log(LogNotice, "db_ido", "Cleanup (" + tables[i].name + "): " + Convert::ToString(max_age) + + Log(LogNotice, "DbConnection", "Cleanup (" + tables[i].name + "): " + Convert::ToString(max_age) + " now: " + Convert::ToString(now) + " old: " + Convert::ToString(now - max_age)); } diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index a244cfffb..691511b0c 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -278,11 +278,11 @@ void DbEvents::AddCommentHistory(const Checkable::Ptr& checkable, const Comment: void DbEvents::AddCommentInternal(const Checkable::Ptr& checkable, const Comment::Ptr& comment, bool historical) { if (!comment) { - Log(LogWarning, "db_ido", "comment does not exist. not adding it."); + Log(LogWarning, "DbEvents", "comment does not exist. not adding it."); return; } - Log(LogDebug, "db_ido", "adding service comment (id = " + Convert::ToString(comment->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "adding service comment (id = " + Convert::ToString(comment->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); /* add the service comment */ AddCommentByType(checkable, comment, historical); @@ -307,7 +307,7 @@ void DbEvents::AddCommentByType(const DynamicObject::Ptr& object, const Comment: fields1->Set("comment_type", 1); fields1->Set("internal_comment_id", comment->GetLegacyId()); } else { - Log(LogDebug, "db_ido", "unknown object type for adding comment."); + Log(LogDebug, "DbEvents", "unknown object type for adding comment."); return; } @@ -340,7 +340,7 @@ void DbEvents::AddCommentByType(const DynamicObject::Ptr& object, const Comment: void DbEvents::RemoveComments(const Checkable::Ptr& checkable) { - Log(LogDebug, "db_ido", "removing service comments for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "removing service comments for '" + checkable->GetName() + "'"); DbQuery query1; query1.Table = "comments"; @@ -354,11 +354,11 @@ void DbEvents::RemoveComments(const Checkable::Ptr& checkable) void DbEvents::RemoveComment(const Checkable::Ptr& checkable, const Comment::Ptr& comment) { if (!comment) { - Log(LogWarning, "db_ido", "comment does not exist. not deleting it."); + Log(LogWarning, "DbEvents", "comment does not exist. not deleting it."); return; } - Log(LogDebug, "db_ido", "removing service comment (id = " + Convert::ToString(comment->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "removing service comment (id = " + Convert::ToString(comment->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); /* Status */ DbQuery query1; @@ -423,11 +423,11 @@ void DbEvents::AddDowntimeHistory(const Checkable::Ptr& checkable, const Downtim void DbEvents::AddDowntimeInternal(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime, bool historical) { if (!downtime) { - Log(LogWarning, "db_ido", "downtime does not exist. not adding it."); + Log(LogWarning, "DbEvents", "downtime does not exist. not adding it."); return; } - Log(LogDebug, "db_ido", "adding service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "adding service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); /* add the downtime */ AddDowntimeByType(checkable, downtime, historical);} @@ -446,7 +446,7 @@ void DbEvents::AddDowntimeByType(const Checkable::Ptr& checkable, const Downtime fields1->Set("downtime_type", 1); fields1->Set("internal_downtime_id", downtime->GetLegacyId()); } else { - Log(LogDebug, "db_ido", "unknown object type for adding downtime."); + Log(LogDebug, "DbEvents", "unknown object type for adding downtime."); return; } @@ -485,7 +485,7 @@ void DbEvents::AddDowntimeByType(const Checkable::Ptr& checkable, const Downtime void DbEvents::RemoveDowntimes(const Checkable::Ptr& checkable) { - Log(LogDebug, "db_ido", "removing service downtimes for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "removing service downtimes for '" + checkable->GetName() + "'"); DbQuery query1; query1.Table = "scheduleddowntime"; @@ -499,11 +499,11 @@ void DbEvents::RemoveDowntimes(const Checkable::Ptr& checkable) void DbEvents::RemoveDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime) { if (!downtime) { - Log(LogWarning, "db_ido", "downtime does not exist. not adding it."); + Log(LogWarning, "DbEvents", "downtime does not exist. not adding it."); return; } - Log(LogDebug, "db_ido", "removing service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "removing service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); /* Status */ DbQuery query1; @@ -543,11 +543,11 @@ void DbEvents::RemoveDowntime(const Checkable::Ptr& checkable, const Downtime::P void DbEvents::TriggerDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime) { if (!downtime) { - Log(LogWarning, "db_ido", "downtime does not exist. not updating it."); + Log(LogWarning, "DbEvents", "downtime does not exist. not updating it."); return; } - Log(LogDebug, "db_ido", "updating triggered service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "updating triggered service downtime (id = " + Convert::ToString(downtime->GetLegacyId()) + ") for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -629,7 +629,7 @@ void DbEvents::TriggerDowntime(const Checkable::Ptr& checkable, const Downtime:: void DbEvents::AddAcknowledgementHistory(const Checkable::Ptr& checkable, const String& author, const String& comment, AcknowledgementType type, double expiry) { - Log(LogDebug, "db_ido", "add acknowledgement history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add acknowledgement history for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -669,14 +669,14 @@ void DbEvents::AddAcknowledgementHistory(const Checkable::Ptr& checkable, const void DbEvents::AddAcknowledgement(const Checkable::Ptr& checkable, AcknowledgementType type) { - Log(LogDebug, "db_ido", "add acknowledgement for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add acknowledgement for '" + checkable->GetName() + "'"); AddAcknowledgementInternal(checkable, type, true); } void DbEvents::RemoveAcknowledgement(const Checkable::Ptr& checkable) { - Log(LogDebug, "db_ido", "remove acknowledgement for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "remove acknowledgement for '" + checkable->GetName() + "'"); AddAcknowledgementInternal(checkable, AcknowledgementNone, false); } @@ -716,7 +716,7 @@ void DbEvents::AddAcknowledgementInternal(const Checkable::Ptr& checkable, Ackno void DbEvents::AddNotificationHistory(const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set& users, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text) { - Log(LogDebug, "db_ido", "add notification history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add notification history for '" + checkable->GetName() + "'"); /* start and end happen at the same time */ double now = Utility::GetTime(); @@ -768,7 +768,7 @@ void DbEvents::AddNotificationHistory(const Notification::Ptr& notification, con /* filtered users */ BOOST_FOREACH(const User::Ptr& user, users) { - Log(LogDebug, "db_ido", "add contact notification history for service '" + checkable->GetName() + "' and user '" + user->GetName() + "'."); + Log(LogDebug, "DbEvents", "add contact notification history for service '" + checkable->GetName() + "' and user '" + user->GetName() + "'."); Dictionary::Ptr fields2 = make_shared(); fields2->Set("contact_object_id", user); @@ -788,7 +788,7 @@ void DbEvents::AddNotificationHistory(const Notification::Ptr& notification, con /* statehistory */ void DbEvents::AddStateChangeHistory(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type) { - Log(LogDebug, "db_ido", "add state change history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add state change history for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -897,7 +897,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C type = LogEntryTypeServiceCritical; break; default: - Log(LogCritical, "db_ido", "Unknown service state: " + Convert::ToString(state_after)); + Log(LogCritical, "DbEvents", "Unknown service state: " + Convert::ToString(state_after)); return; } } else { @@ -922,7 +922,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C type = LogEntryTypeHostDown; break; default: - Log(LogCritical, "db_ido", "Unknown host state: " + Convert::ToString(state_after)); + Log(LogCritical, "DbEvents", "Unknown host state: " + Convert::ToString(state_after)); return; } @@ -1076,7 +1076,7 @@ void DbEvents::AddFlappingLogHistory(const Checkable::Ptr& checkable, FlappingSt flapping_state_str = "DISABLED"; break; default: - Log(LogCritical, "db_ido", "Unknown flapping state: " + Convert::ToString(flapping_state)); + Log(LogCritical, "DbEvents", "Unknown flapping state: " + Convert::ToString(flapping_state)); return; } @@ -1106,7 +1106,7 @@ void DbEvents::AddFlappingLogHistory(const Checkable::Ptr& checkable, FlappingSt void DbEvents::AddLogHistory(const Checkable::Ptr& checkable, String buffer, LogEntryType type) { - Log(LogDebug, "db_ido", "add log entry history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add log entry history for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -1139,7 +1139,7 @@ void DbEvents::AddLogHistory(const Checkable::Ptr& checkable, String buffer, Log /* flappinghistory */ void DbEvents::AddFlappingHistory(const Checkable::Ptr& checkable, FlappingState flapping_state) { - Log(LogDebug, "db_ido", "add flapping history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add flapping history for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -1167,7 +1167,7 @@ void DbEvents::AddFlappingHistory(const Checkable::Ptr& checkable, FlappingState fields1->Set("reason_type", 2); break; default: - Log(LogDebug, "db_ido", "Unhandled flapping state: " + Convert::ToString(flapping_state)); + Log(LogDebug, "DbEvents", "Unhandled flapping state: " + Convert::ToString(flapping_state)); return; } @@ -1199,7 +1199,7 @@ void DbEvents::AddServiceCheckHistory(const Checkable::Ptr& checkable, const Che if (!cr) return; - Log(LogDebug, "db_ido", "add service check history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add service check history for '" + checkable->GetName() + "'"); Host::Ptr host; Service::Ptr service; @@ -1263,7 +1263,7 @@ void DbEvents::AddServiceCheckHistory(const Checkable::Ptr& checkable, const Che /* eventhandlers */ void DbEvents::AddEventHandlerHistory(const Checkable::Ptr& checkable) { - Log(LogDebug, "db_ido", "add eventhandler history for '" + checkable->GetName() + "'"); + Log(LogDebug, "DbEvents", "add eventhandler history for '" + checkable->GetName() + "'"); double now = Utility::GetTime(); std::pair time_bag = CompatUtility::ConvertTimestamp(now); @@ -1305,7 +1305,7 @@ void DbEvents::AddEventHandlerHistory(const Checkable::Ptr& checkable) /* externalcommands */ void DbEvents::AddExternalCommandHistory(double time, const String& command, const std::vector& arguments) { - Log(LogDebug, "db_ido", "add external command history"); + Log(LogDebug, "DbEvents", "add external command history"); DbQuery query1; query1.Table = "externalcommands"; diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp index aa635b744..48c98c1b3 100644 --- a/lib/db_ido/dbobject.cpp +++ b/lib/db_ido/dbobject.cpp @@ -127,7 +127,7 @@ void DbObject::SendStatusUpdate(void) if (GetType()->GetTable() != "endpoint") { String node = IcingaApplication::GetInstance()->GetNodeName(); - Log(LogDebug, "db_ido", "Endpoint node: '" + node + "' status update for '" + GetObject()->GetName() + "'"); + Log(LogDebug, "DbObject", "Endpoint node: '" + node + "' status update for '" + GetObject()->GetName() + "'"); Endpoint::Ptr endpoint = Endpoint::GetByName(node); if (endpoint) @@ -160,7 +160,7 @@ void DbObject::SendVarsConfigUpdate(void) Dictionary::Ptr vars = CompatUtility::GetCustomAttributeConfig(custom_var_object); if (vars) { - Log(LogDebug, "db_ido", "Updating object vars for '" + custom_var_object->GetName() + "'"); + Log(LogDebug, "DbObject", "Updating object vars for '" + custom_var_object->GetName() + "'"); ObjectLock olock (vars); @@ -168,7 +168,7 @@ void DbObject::SendVarsConfigUpdate(void) if (!kv.first.IsEmpty()) { int overridden = custom_var_object->IsVarOverridden(kv.first) ? 1 : 0; - Log(LogDebug, "db_ido", "object customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + + Log(LogDebug, "DbObject", "object customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + "' overridden: " + Convert::ToString(overridden)); Dictionary::Ptr fields = make_shared(); @@ -202,7 +202,7 @@ void DbObject::SendVarsStatusUpdate(void) Dictionary::Ptr vars = CompatUtility::GetCustomAttributeConfig(custom_var_object); if (vars) { - Log(LogDebug, "db_ido", "Updating object vars for '" + custom_var_object->GetName() + "'"); + Log(LogDebug, "DbObject", "Updating object vars for '" + custom_var_object->GetName() + "'"); ObjectLock olock (vars); @@ -210,7 +210,7 @@ void DbObject::SendVarsStatusUpdate(void) if (!kv.first.IsEmpty()) { int overridden = custom_var_object->IsVarOverridden(kv.first) ? 1 : 0; - Log(LogDebug, "db_ido", "object customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + + Log(LogDebug, "DbObject", "object customvar key: '" + kv.first + "' value: '" + Convert::ToString(kv.second) + "' overridden: " + Convert::ToString(overridden)); Dictionary::Ptr fields = make_shared(); @@ -322,7 +322,7 @@ void DbObject::VarsChangedHandler(const CustomVarObject::Ptr& object) { DbObject::Ptr dbobj = GetOrCreateByObject(object); - Log(LogDebug, "db_ido", "Vars changed for object '" + object->GetName() + "'"); + Log(LogDebug, "DbObject", "Vars changed for object '" + object->GetName() + "'"); if (!dbobj) return; diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp index 2f74fa9c8..49fbed5c2 100644 --- a/lib/db_ido/endpointdbobject.cpp +++ b/lib/db_ido/endpointdbobject.cpp @@ -62,7 +62,7 @@ Dictionary::Ptr EndpointDbObject::GetStatusFields(void) const Dictionary::Ptr fields = make_shared(); Endpoint::Ptr endpoint = static_pointer_cast(GetObject()); - Log(LogDebug, "db_ido", "update status for endpoint '" + endpoint->GetName() + "'"); + Log(LogDebug, "EndpointDbObject", "update status for endpoint '" + endpoint->GetName() + "'"); fields->Set("identity", endpoint->GetName()); fields->Set("node", IcingaApplication::GetInstance()->GetNodeName()); @@ -75,7 +75,7 @@ void EndpointDbObject::UpdateConnectedStatus(const Endpoint::Ptr& endpoint) { bool connected = EndpointIsConnected(endpoint); - Log(LogDebug, "db_ido", "update is_connected=" + Convert::ToString(connected ? 1 : 0) + " for endpoint '" + endpoint->GetName() + "'"); + Log(LogDebug, "EndpointDbObject", "update is_connected=" + Convert::ToString(connected ? 1 : 0) + " for endpoint '" + endpoint->GetName() + "'"); DbQuery query1; query1.Table = "endpointstatus"; diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index db6070e54..ff43697c8 100644 --- a/lib/db_ido/hostdbobject.cpp +++ b/lib/db_ido/hostdbobject.cpp @@ -184,7 +184,7 @@ void HostDbObject::OnConfigUpdate(void) if (!parent) continue; - Log(LogDebug, "db_ido", "host parents: " + parent->GetName()); + Log(LogDebug, "HostDbObject", "host parents: " + parent->GetName()); /* parents: host_id, parent_host_object_id */ Dictionary::Ptr fields1 = make_shared(); @@ -201,19 +201,19 @@ void HostDbObject::OnConfigUpdate(void) } /* host dependencies */ - Log(LogDebug, "db_ido", "host dependencies for '" + host->GetName() + "'"); + Log(LogDebug, "HostDbObject", "host dependencies for '" + host->GetName() + "'"); BOOST_FOREACH(const Dependency::Ptr& dep, host->GetDependencies()) { Checkable::Ptr parent = dep->GetParent(); if (!parent) { - Log(LogDebug, "db_ido", "Missing parent for dependency '" + dep->GetName() + "'."); + Log(LogDebug, "HostDbObject", "Missing parent for dependency '" + dep->GetName() + "'."); continue; } int state_filter = dep->GetStateFilter(); - Log(LogDebug, "db_ido", "parent host: " + parent->GetName()); + Log(LogDebug, "HostDbObject", "parent host: " + parent->GetName()); Dictionary::Ptr fields2 = make_shared(); fields2->Set("host_object_id", parent); @@ -232,10 +232,10 @@ void HostDbObject::OnConfigUpdate(void) OnQuery(query2); } - Log(LogDebug, "db_ido", "host contacts: " + host->GetName()); + Log(LogDebug, "HostDbObject", "host contacts: " + host->GetName()); BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetCheckableNotificationUsers(host)) { - Log(LogDebug, "db_ido", "host contacts: " + user->GetName()); + Log(LogDebug, "HostDbObject", "host contacts: " + user->GetName()); Dictionary::Ptr fields_contact = make_shared(); fields_contact->Set("host_id", DbValue::FromObjectInsertID(host)); @@ -250,10 +250,10 @@ void HostDbObject::OnConfigUpdate(void) OnQuery(query_contact); } - Log(LogDebug, "db_ido", "host contactgroups: " + host->GetName()); + Log(LogDebug, "HostDbObject", "host contactgroups: " + host->GetName()); BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetCheckableNotificationUserGroups(host)) { - Log(LogDebug, "db_ido", "host contactgroups: " + usergroup->GetName()); + Log(LogDebug, "HostDbObject", "host contactgroups: " + usergroup->GetName()); Dictionary::Ptr fields_contact = make_shared(); fields_contact->Set("host_id", DbValue::FromObjectInsertID(host)); diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp index 43d2d014c..6a8cc1c36 100644 --- a/lib/db_ido/servicedbobject.cpp +++ b/lib/db_ido/servicedbobject.cpp @@ -177,17 +177,17 @@ void ServiceDbObject::OnConfigUpdate(void) Service::Ptr service = static_pointer_cast(GetObject()); /* service dependencies */ - Log(LogDebug, "db_ido", "service dependencies for '" + service->GetName() + "'"); + Log(LogDebug, "ServiceDbObject", "service dependencies for '" + service->GetName() + "'"); BOOST_FOREACH(const Dependency::Ptr& dep, service->GetDependencies()) { Checkable::Ptr parent = dep->GetParent(); if (!parent) { - Log(LogDebug, "db_ido", "Missing parent for dependency '" + dep->GetName() + "'."); + Log(LogDebug, "ServiceDbObject", "Missing parent for dependency '" + dep->GetName() + "'."); continue; } - Log(LogDebug, "db_ido", "service parents: " + parent->GetName()); + Log(LogDebug, "ServiceDbObject", "service parents: " + parent->GetName()); int state_filter = dep->GetStateFilter(); @@ -212,10 +212,10 @@ void ServiceDbObject::OnConfigUpdate(void) } /* service contacts, contactgroups */ - Log(LogDebug, "db_ido", "service contacts: " + service->GetName()); + Log(LogDebug, "ServiceDbObject", "service contacts: " + service->GetName()); BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetCheckableNotificationUsers(service)) { - Log(LogDebug, "db_ido", "service contacts: " + user->GetName()); + Log(LogDebug, "ServiceDbObject", "service contacts: " + user->GetName()); Dictionary::Ptr fields_contact = make_shared(); fields_contact->Set("service_id", DbValue::FromObjectInsertID(service)); @@ -230,10 +230,10 @@ void ServiceDbObject::OnConfigUpdate(void) OnQuery(query_contact); } - Log(LogDebug, "db_ido", "service contactgroups: " + service->GetName()); + Log(LogDebug, "ServiceDbObject", "service contactgroups: " + service->GetName()); BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetCheckableNotificationUserGroups(service)) { - Log(LogDebug, "db_ido", "service contactgroups: " + usergroup->GetName()); + Log(LogDebug, "ServiceDbObject", "service contactgroups: " + usergroup->GetName()); Dictionary::Ptr fields_contact = make_shared(); fields_contact->Set("service_id", DbValue::FromObjectInsertID(service)); diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp index af31a661f..1a37bae61 100644 --- a/lib/db_ido/userdbobject.cpp +++ b/lib/db_ido/userdbobject.cpp @@ -85,7 +85,7 @@ void UserDbObject::OnConfigUpdate(void) User::Ptr user = static_pointer_cast(GetObject()); /* contact addresses */ - Log(LogDebug, "db_ido", "contact addresses for '" + user->GetName() + "'"); + Log(LogDebug, "UserDbObject", "contact addresses for '" + user->GetName() + "'"); Dictionary::Ptr vars = user->GetVars();