mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-25 06:34:42 +02:00
Implement support for time periods.
This commit is contained in:
parent
ccbb98e64a
commit
54ce8d51d8
@ -74,6 +74,14 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether the task is finished.
|
||||||
|
*/
|
||||||
|
bool IsFinished(void) const
|
||||||
|
{
|
||||||
|
return m_Finished;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the result of the task. Throws an exception if one is stored in
|
* Retrieves the result of the task. Throws an exception if one is stored in
|
||||||
* the AsyncTask object.
|
* the AsyncTask object.
|
||||||
|
@ -97,6 +97,20 @@ public:
|
|||||||
static boost::signal<void (const DynamicObject::Ptr&)> OnUnregistered;
|
static boost::signal<void (const DynamicObject::Ptr&)> OnUnregistered;
|
||||||
static boost::signal<void (const set<DynamicObject::Ptr>&)> OnTransactionClosing;
|
static boost::signal<void (const set<DynamicObject::Ptr>&)> OnTransactionClosing;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Synchronously invokes a method. The method must not return before it's finished.
|
||||||
|
*
|
||||||
|
* @param method The name of the method.
|
||||||
|
* @param arguments Arguments for the method.
|
||||||
|
*/
|
||||||
|
template<typename T>
|
||||||
|
T InvokeMethodSync(const String& method, const vector<Value>& arguments)
|
||||||
|
{
|
||||||
|
ScriptTask::Ptr task = InvokeMethod(method, arguments, ScriptTask::CompletionCallback());
|
||||||
|
assert(task->IsFinished());
|
||||||
|
return task->GetResult();
|
||||||
|
}
|
||||||
|
|
||||||
ScriptTask::Ptr InvokeMethod(const String& method,
|
ScriptTask::Ptr InvokeMethod(const String& method,
|
||||||
const vector<Value>& arguments, ScriptTask::CompletionCallback callback);
|
const vector<Value>& arguments, ScriptTask::CompletionCallback callback);
|
||||||
|
|
||||||
|
@ -25,7 +25,9 @@ libicinga_la_SOURCES = \
|
|||||||
servicegroup.h \
|
servicegroup.h \
|
||||||
service.h \
|
service.h \
|
||||||
servicestatechangemessage.cpp \
|
servicestatechangemessage.cpp \
|
||||||
servicestatechangemessage.h
|
servicestatechangemessage.h \
|
||||||
|
timeperiod.cpp \
|
||||||
|
timeperiod.h
|
||||||
|
|
||||||
libicinga_la_CPPFLAGS = \
|
libicinga_la_CPPFLAGS = \
|
||||||
-DI2_ICINGA_BUILD \
|
-DI2_ICINGA_BUILD \
|
||||||
|
@ -44,6 +44,8 @@ using boost::algorithm::is_any_of;
|
|||||||
#include "endpointmanager.h"
|
#include "endpointmanager.h"
|
||||||
#include "icingaapplication.h"
|
#include "icingaapplication.h"
|
||||||
|
|
||||||
|
#include "timeperiod.h"
|
||||||
|
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "hostgroup.h"
|
#include "hostgroup.h"
|
||||||
#include "service.h"
|
#include "service.h"
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
<ClCompile Include="service.cpp" />
|
<ClCompile Include="service.cpp" />
|
||||||
<ClCompile Include="servicegroup.cpp" />
|
<ClCompile Include="servicegroup.cpp" />
|
||||||
<ClCompile Include="servicestatechangemessage.cpp" />
|
<ClCompile Include="servicestatechangemessage.cpp" />
|
||||||
|
<ClCompile Include="timeperiod.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="cib.h" />
|
<ClInclude Include="cib.h" />
|
||||||
@ -48,6 +49,7 @@
|
|||||||
<ClInclude Include="service.h" />
|
<ClInclude Include="service.h" />
|
||||||
<ClInclude Include="servicegroup.h" />
|
<ClInclude Include="servicegroup.h" />
|
||||||
<ClInclude Include="servicestatechangemessage.h" />
|
<ClInclude Include="servicestatechangemessage.h" />
|
||||||
|
<ClInclude Include="timeperiod.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}</ProjectGuid>
|
<ProjectGuid>{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}</ProjectGuid>
|
||||||
@ -199,4 +201,4 @@
|
|||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
@ -34,6 +34,9 @@
|
|||||||
<ClCompile Include="pluginchecktask.cpp">
|
<ClCompile Include="pluginchecktask.cpp">
|
||||||
<Filter>Quelldateien</Filter>
|
<Filter>Quelldateien</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="timeperiod.cpp">
|
||||||
|
<Filter>Quelldateien</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="i2-icinga.h">
|
<ClInclude Include="i2-icinga.h">
|
||||||
@ -69,6 +72,9 @@
|
|||||||
<ClInclude Include="pluginchecktask.h">
|
<ClInclude Include="pluginchecktask.h">
|
||||||
<Filter>Headerdateien</Filter>
|
<Filter>Headerdateien</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="timeperiod.h">
|
||||||
|
<Filter>Headerdateien</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Filter Include="Headerdateien">
|
<Filter Include="Headerdateien">
|
||||||
|
80
lib/icinga/timeperiod.cpp
Normal file
80
lib/icinga/timeperiod.cpp
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Icinga 2 *
|
||||||
|
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License *
|
||||||
|
* as published by the Free Software Foundation; either version 2 *
|
||||||
|
* of the License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This program is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with this program; if not, write to the Free Software Foundation *
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#include "i2-icinga.h"
|
||||||
|
|
||||||
|
using namespace icinga;
|
||||||
|
|
||||||
|
static AttributeDescription timePeriodAttributes[] = {
|
||||||
|
{ "alias", Attribute_Config },
|
||||||
|
{ "cached_state", Attribute_Transient },
|
||||||
|
{ "cached_next_change", Attribute_Transient }
|
||||||
|
};
|
||||||
|
|
||||||
|
REGISTER_TYPE(TimePeriod, timePeriodAttributes);
|
||||||
|
|
||||||
|
String TimePeriod::GetAlias(void) const
|
||||||
|
{
|
||||||
|
String value = Get("alias");
|
||||||
|
|
||||||
|
if (!value.IsEmpty())
|
||||||
|
return value;
|
||||||
|
else
|
||||||
|
return GetName();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool TimePeriod::Exists(const String& name)
|
||||||
|
{
|
||||||
|
return (DynamicObject::GetObject("TimePeriod", name));
|
||||||
|
}
|
||||||
|
|
||||||
|
TimePeriod::Ptr TimePeriod::GetByName(const String& name)
|
||||||
|
{
|
||||||
|
DynamicObject::Ptr configObject = DynamicObject::GetObject("TimePeriod", name);
|
||||||
|
|
||||||
|
if (!configObject)
|
||||||
|
throw_exception(invalid_argument("TimePeriod '" + name + "' does not exist."));
|
||||||
|
|
||||||
|
return dynamic_pointer_cast<TimePeriod>(configObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool TimePeriod::IsActive(void) {
|
||||||
|
if (GetNextChange() > Utility::GetTime()) {
|
||||||
|
vector<Value> args;
|
||||||
|
args.push_back(static_cast<TimePeriod::Ptr>(GetSelf()));
|
||||||
|
return InvokeMethodSync<bool>("is_active", args);
|
||||||
|
} else {
|
||||||
|
return Get("cached_state");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
double TimePeriod::GetNextChange(void) {
|
||||||
|
double next_change = Get("cached_next_change");
|
||||||
|
|
||||||
|
if (next_change < Utility::GetTime()) {
|
||||||
|
vector<Value> args;
|
||||||
|
args.push_back(static_cast<TimePeriod::Ptr>(GetSelf()));
|
||||||
|
next_change = InvokeMethodSync<bool>("is_active", args);
|
||||||
|
// TODO: figure out next_change by calling method
|
||||||
|
|
||||||
|
Set("cached_next_change", next_change);
|
||||||
|
}
|
||||||
|
|
||||||
|
return next_change;
|
||||||
|
}
|
46
lib/icinga/timeperiod.h
Normal file
46
lib/icinga/timeperiod.h
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Icinga 2 *
|
||||||
|
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License *
|
||||||
|
* as published by the Free Software Foundation; either version 2 *
|
||||||
|
* of the License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This program is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with this program; if not, write to the Free Software Foundation *
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#ifndef TIMEPERIOD_H
|
||||||
|
#define TIMEPERIOD_H
|
||||||
|
|
||||||
|
namespace icinga
|
||||||
|
{
|
||||||
|
|
||||||
|
class TimePeriod : public DynamicObject {
|
||||||
|
public:
|
||||||
|
typedef shared_ptr<TimePeriod> Ptr;
|
||||||
|
typedef weak_ptr<TimePeriod> WeakPtr;
|
||||||
|
|
||||||
|
TimePeriod(const Dictionary::Ptr& properties)
|
||||||
|
: DynamicObject(properties)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
static bool Exists(const String& name);
|
||||||
|
static TimePeriod::Ptr GetByName(const String& name);
|
||||||
|
|
||||||
|
String GetAlias(void) const;
|
||||||
|
|
||||||
|
bool IsActive(void);
|
||||||
|
double GetNextChange(void);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* TIMEPERIOD_H */
|
Loading…
x
Reference in New Issue
Block a user