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

Replace GetType()->GetName() calls with GetReflectionType()->GetName() 

fixes #12438
This commit is contained in:
Gunnar Beutner 2016-08-15 14:39:33 +02:00
parent bc06ff18e5
commit ebaf239d3b
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/configobject.cpp
View File

@ -384,7 +384,7 @@ void ConfigObject::Start(bool runtimeCreated)
void ConfigObject::Activate(bool runtimeCreated)
{
CONTEXT("Activating object '" + GetName() + "' of type '" + GetType()->GetName() + "'");
CONTEXT("Activating object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'");
{
ObjectLock olock(this);
@ -413,7 +413,7 @@ void ConfigObject::Stop(bool runtimeRemoved)
void ConfigObject::Deactivate(bool runtimeRemoved)
{
CONTEXT("Deactivating object '" + GetName() + "' of type '" + GetType()->GetName() + "'");
CONTEXT("Deactivating object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'");
{
ObjectLock olock(this);

11
lib/db_ido/dbobject.cpp
View File

@ -23,6 +23,9 @@
#include "icinga/customvarobject.hpp"
#include "icinga/service.hpp"
#include "icinga/compatutility.hpp"
#include "icinga/checkcommand.hpp"
#include "icinga/eventcommand.hpp"
#include "icinga/notificationcommand.hpp"
#include "remote/endpoint.hpp"
#include "base/configobject.hpp"
#include "base/configtype.hpp"
@ -288,7 +291,7 @@ DbObject::Ptr DbObject::GetOrCreateByObject(const ConfigObject::Ptr& object)
if (dbobj)
return dbobj;
DbType::Ptr dbtype = DbType::GetByName(object->GetType()->GetName());
DbType::Ptr dbtype = DbType::GetByName(object->GetReflectionType()->GetName());
if (!dbtype)
return DbObject::Ptr();
@ -304,9 +307,9 @@ DbObject::Ptr DbObject::GetOrCreateByObject(const ConfigObject::Ptr& object)
name1 = service->GetHost()->GetName();
name2 = service->GetShortName();
} else {
if (object->GetType() == ConfigType::GetByName("CheckCommand") ||
object->GetType() == ConfigType::GetByName("EventCommand") ||
object->GetType() == ConfigType::GetByName("NotificationCommand")) {
if (object->GetReflectionType() == CheckCommand::TypeInstance ||
object->GetReflectionType() == EventCommand::TypeInstance ||
object->GetReflectionType() == NotificationCommand::TypeInstance) {
Command::Ptr command = dynamic_pointer_cast<Command>(object);
name1 = CompatUtility::GetCommandName(command);
}

7
lib/icinga/compatutility.cpp
View File

@ -20,6 +20,7 @@
#include "icinga/compatutility.hpp"
#include "icinga/checkcommand.hpp"
#include "icinga/eventcommand.hpp"
#include "icinga/notificationcommand.hpp"
#include "icinga/pluginutility.hpp"
#include "icinga/service.hpp"
#include "base/utility.hpp"
@ -62,11 +63,11 @@ String CompatUtility::GetCommandNamePrefix(const Command::Ptr command)
return Empty;
String prefix;
if (command->GetType() == ConfigType::GetByName("CheckCommand"))
if (command->GetReflectionType() == CheckCommand::TypeInstance)
prefix = "check_";
else if (command->GetType() == ConfigType::GetByName("NotificationCommand"))
else if (command->GetReflectionType() == NotificationCommand::TypeInstance)
prefix = "notification_";
else if (command->GetType() == ConfigType::GetByName("EventCommand"))
else if (command->GetReflectionType() == EventCommand::TypeInstance)
prefix = "event_";
return prefix;

4
lib/remote/apilistener-configsync.cpp
View File

@ -291,7 +291,7 @@ void ApiListener::UpdateConfigObject(const ConfigObject::Ptr& object, const Mess
Dictionary::Ptr params = new Dictionary();
params->Set("name", object->GetName());
params->Set("type", object->GetType()->GetName());
params->Set("type", object->GetReflectionType()->GetName());
params->Set("version", object->GetVersion());
if (object->GetPackage() == "_api") {
@ -370,7 +370,7 @@ void ApiListener::DeleteConfigObject(const ConfigObject::Ptr& object, const Mess
Dictionary::Ptr params = new Dictionary();
params->Set("name", object->GetName());
params->Set("type", object->GetType()->GetName());
params->Set("type", object->GetReflectionType()->GetName());
params->Set("version", object->GetVersion());
message->Set("params", params);

2
lib/remote/apilistener.cpp
View File

@ -651,7 +651,7 @@ void ApiListener::PersistMessage(const Dictionary::Ptr& message, const ConfigObj
if (secobj) {
Dictionary::Ptr secname = new Dictionary();
secname->Set("type", secobj->GetType()->GetName());
secname->Set("type", secobj->GetReflectionType()->GetName());
secname->Set("name", secobj->GetName());
pmessage->Set("secobj", secname);
}