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

Remove unused attributes

This commit is contained in:
Gunnar Beutner 2014-11-07 21:40:47 +01:00
parent 1bb928b5e9
commit ade12dc27a
7 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/dynamicobject.ti
View File

@ -48,7 +48,6 @@ abstract class DynamicObject
[config] String zone; [config] String zone;
[config, internal, get_protected] Array::Ptr templates; [config, internal, get_protected] Array::Ptr templates;
[config] Dictionary::Ptr methods; [config] Dictionary::Ptr methods;
[config] Dictionary::Ptr vars (VarsRaw);
[get_protected] bool active; [get_protected] bool active;
[get_protected] bool paused { [get_protected] bool paused {
default {{{ return true; }}} default {{{ return true; }}}
@ -58,11 +57,8 @@ abstract class DynamicObject
[get_protected] bool pause_called; [get_protected] bool pause_called;
[get_protected] bool resume_called; [get_protected] bool resume_called;
[enum] HAMode ha_mode (HAMode); [enum] HAMode ha_mode (HAMode);
Dictionary::Ptr authority_info;
[protected] Dictionary::Ptr extensions; [protected] Dictionary::Ptr extensions;
[state] Value override_vars;
[protected] bool state_loaded; [protected] bool state_loaded;
}; };

2
lib/icinga/checkable.cpp
View File

@ -197,7 +197,7 @@ int Checkable::GetModifiedAttributes(void) const
if (!GetOverrideCheckPeriod().IsEmpty()) if (!GetOverrideCheckPeriod().IsEmpty())
attrs |= ModAttrCheckTimeperiod; attrs |= ModAttrCheckTimeperiod;
if (!GetOverrideVars().IsEmpty()) if (GetOverrideVars())
attrs |= ModAttrCustomVariable; attrs |= ModAttrCustomVariable;
// TODO: finish // TODO: finish

2
lib/icinga/command.cpp
View File

@ -30,7 +30,7 @@ int Command::GetModifiedAttributes(void) const
{ {
int attrs = 0; int attrs = 0;
if (!GetOverrideVars().IsEmpty()) if (GetOverrideVars())
attrs |= ModAttrCustomVariable; attrs |= ModAttrCustomVariable;
return attrs; return attrs;

2
lib/icinga/customvarobject.cpp
View File

@ -28,7 +28,7 @@ boost::signals2::signal<void (const CustomVarObject::Ptr&, const Dictionary::Ptr
Dictionary::Ptr CustomVarObject::GetVars(void) const Dictionary::Ptr CustomVarObject::GetVars(void) const
{ {
if (!GetOverrideVars().IsEmpty()) if (GetOverrideVars())
return GetOverrideVars(); return GetOverrideVars();
else else
return GetVarsRaw(); return GetVarsRaw();

2
lib/icinga/customvarobject.ti
View File

@ -26,7 +26,7 @@ abstract class CustomVarObject : DynamicObject
{ {
[config] Dictionary::Ptr vars (VarsRaw); [config] Dictionary::Ptr vars (VarsRaw);
[state] Value override_vars; [state] Dictionary::Ptr override_vars;
}; };
} }

1
lib/icinga/notification.ti
View File

@ -37,7 +37,6 @@ class Notification : CustomVarObject < NotificationNameComposer
default {{{ return 1800; }}} default {{{ return 1800; }}}
}; };
[config] String period (PeriodRaw); [config] String period (PeriodRaw);
[config] Dictionary::Ptr macros;
[config, protected] Array::Ptr users (UsersRaw); [config, protected] Array::Ptr users (UsersRaw);
[config, protected] Array::Ptr user_groups (UserGroupsRaw); [config, protected] Array::Ptr user_groups (UserGroupsRaw);
[config] Dictionary::Ptr times; [config] Dictionary::Ptr times;

2
lib/icinga/user.cpp
View File

@ -114,7 +114,7 @@ int User::GetModifiedAttributes(void) const
{ {
int attrs = 0; int attrs = 0;
if (!GetOverrideVars().IsEmpty()) if (GetOverrideVars())
attrs |= ModAttrCustomVariable; attrs |= ModAttrCustomVariable;
return attrs; return attrs;