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

Convert global attributes to script variables.

This commit is contained in:
Gunnar Beutner 2013-10-08 12:37:21 +02:00
parent 29adc21021
commit 9782a361bb
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/icinga/icingaapplication.cpp
View File

@ -26,6 +26,7 @@
#include "base/utility.h"
#include "base/timer.h"
#include "base/scriptvariable.h"
#include "base/initialize.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
@ -33,19 +34,20 @@ using namespace icinga;
static Timer::Ptr l_RetentionTimer;
REGISTER_TYPE(IcingaApplication);
INITIALIZE_ONCE(IcingaApplication, &IcingaApplication::StaticInitialize);
#ifndef _WIN32
# include "icinga-version.h"
# define ICINGA_VERSION GIT_MESSAGE
#endif /* _WIN32 */
IcingaApplication::IcingaApplication(void)
void IcingaApplication::StaticInitialize(void)
{
m_EnableNotifications = true;
m_EnableEventHandlers = true;
m_EnableFlapping = true;
m_EnableChecks = true;
m_EnablePerfdata = true;
ScriptVariable::Set("IcingaEnableNotifications", true);
ScriptVariable::Set("IcingaEnableEventHandlers", true);
ScriptVariable::Set("IcingaEnableFlapping", true);
ScriptVariable::Set("IcingaEnableChecks", true);
ScriptVariable::Set("IcingaEnablePerfdata", true);
}
/**
@ -231,14 +233,6 @@ void IcingaApplication::InternalSerialize(const Dictionary::Ptr& bag, int attrib
{
DynamicObject::InternalSerialize(bag, attributeTypes);
if (attributeTypes & Attribute_Config) {
bag->Set("enable_notifications", m_EnableNotifications);
bag->Set("enable_event_handlers", m_EnableEventHandlers);
bag->Set("enable_flapping", m_EnableFlapping);
bag->Set("enable_checks", m_EnableChecks);
bag->Set("enable_perfdata", m_EnablePerfdata);
}
if (attributeTypes & Attribute_State) {
bag->Set("override_enable_notifications", m_OverrideEnableNotifications);
bag->Set("override_enable_event_handlers", m_OverrideEnableEventHandlers);
@ -252,14 +246,6 @@ void IcingaApplication::InternalDeserialize(const Dictionary::Ptr& bag, int attr
{
DynamicObject::InternalDeserialize(bag, attributeTypes);
if (attributeTypes & Attribute_Config) {
m_EnableNotifications = bag->Get("enable_notifications");
m_EnableEventHandlers = bag->Get("enable_event_handlers");
m_EnableFlapping = bag->Get("enable_flapping");
m_EnableChecks = bag->Get("enable_checks");
m_EnablePerfdata = bag->Get("enable_perfdata");
}
if (attributeTypes & Attribute_State) {
m_OverrideEnableNotifications = bag->Get("override_enable_notifications");
m_OverrideEnableEventHandlers = bag->Get("override_enable_event_handlers");

8
lib/icinga/icingaapplication.h
View File

@ -38,7 +38,7 @@ public:
DECLARE_PTR_TYPEDEFS(IcingaApplication);
DECLARE_TYPENAME(IcingaApplication);
IcingaApplication(void);
static void StaticInitialize(void);
int Main(void);
@ -78,12 +78,6 @@ protected:
private:
double m_StartTime;
Value m_EnableNotifications;
Value m_EnableEventHandlers;
Value m_EnableFlapping;
Value m_EnableChecks;
Value m_EnablePerfdata;
Value m_OverrideEnableNotifications;
Value m_OverrideEnableEventHandlers;
Value m_OverrideEnableFlapping;