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

Move ClusterCheckTask into the cluster component. 

Refs #5438
This commit is contained in:
Michael Friedrich 2014-02-12 09:33:04 +01:00
parent 42f664e4c6
commit 3246ee602b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/cluster/CMakeLists.txt
View File

@ -20,7 +20,10 @@ mkclass_target(endpoint.ti endpoint.th)
mkembedconfig_target(cluster-type.conf cluster-type.cpp) mkembedconfig_target(cluster-type.conf cluster-type.cpp)
add_library(cluster SHARED clusterlistener.cpp clusterlistener.th endpoint.cpp endpoint.th jsonrpc.cpp cluster-type.cpp) add_library(cluster SHARED
clusterchecktask.cpp clusterlistener.cpp clusterlistener.th
endpoint.cpp endpoint.th jsonrpc.cpp cluster-type.cpp
)
target_link_libraries(cluster ${Boost_LIBRARIES} base config icinga) target_link_libraries(cluster ${Boost_LIBRARIES} base config icinga)

2
lib/methods/clusterchecktask.cpp → components/cluster/clusterchecktask.cpp
View File

@ -17,7 +17,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#include "methods/clusterchecktask.h" #include "cluster/clusterchecktask.h"
#include "cluster/endpoint.h" #include "cluster/endpoint.h"
#include "cluster/clusterlistener.h" #include "cluster/clusterlistener.h"
#include "icinga/cib.h" #include "icinga/cib.h"

3
lib/methods/clusterchecktask.h → components/cluster/clusterchecktask.h
View File

@ -20,7 +20,6 @@
#ifndef CLUSTERCHECKTASK_H #ifndef CLUSTERCHECKTASK_H
#define CLUSTERCHECKTASK_H #define CLUSTERCHECKTASK_H
#include "methods/i2-methods.h"
#include "icinga/service.h" #include "icinga/service.h"
namespace icinga namespace icinga
@ -31,7 +30,7 @@ namespace icinga
* *
* @ingroup methods * @ingroup methods
*/ */
class I2_METHODS_API ClusterCheckTask class ClusterCheckTask
{ {
public: public:
static CheckResult::Ptr ScriptFunc(const Service::Ptr& service); static CheckResult::Ptr ScriptFunc(const Service::Ptr& service);

4
lib/methods/CMakeLists.txt
View File

@ -16,12 +16,12 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
add_library(methods SHARED add_library(methods SHARED
clusterchecktask.cpp icingachecktask.cpp nullchecktask.cpp nulleventtask.cpp icingachecktask.cpp nullchecktask.cpp nulleventtask.cpp
pluginchecktask.cpp plugineventtask.cpp pluginnotificationtask.cpp pluginchecktask.cpp plugineventtask.cpp pluginnotificationtask.cpp
randomchecktask.cpp timeperiodtask.cpp randomchecktask.cpp timeperiodtask.cpp
) )
target_link_libraries(methods ${Boost_LIBRARIES} base config icinga cluster) target_link_libraries(methods ${Boost_LIBRARIES} base config icinga)
set_target_properties ( set_target_properties (
methods PROPERTIES methods PROPERTIES