diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index 9054dadd6..c12bb0169 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -11,7 +11,6 @@ #include "base/objectlock.hpp" #include "base/configtype.hpp" #include "base/application.hpp" -#include "base/dependencygraph.hpp" #include "base/initialize.hpp" #include "base/namespace.hpp" #include "config/configitem.hpp" @@ -49,7 +48,6 @@ REGISTER_SAFE_FUNCTION(System, basename, &Utility::BaseName, "path"); REGISTER_SAFE_FUNCTION(System, dirname, &Utility::DirName, "path"); REGISTER_SAFE_FUNCTION(System, getenv, &ScriptUtils::GetEnv, "value"); REGISTER_SAFE_FUNCTION(System, msi_get_component_path, &ScriptUtils::MsiGetComponentPathShim, "component"); -REGISTER_SAFE_FUNCTION(System, track_parents, &ScriptUtils::TrackParents, "child"); REGISTER_SAFE_FUNCTION(System, escape_shell_cmd, &Utility::EscapeShellCmd, "cmd"); REGISTER_SAFE_FUNCTION(System, escape_shell_arg, &Utility::EscapeShellArg, "arg"); #ifdef _WIN32 @@ -518,11 +516,6 @@ String ScriptUtils::MsiGetComponentPathShim(const String& component) #endif /* _WIN32 */ } -Array::Ptr ScriptUtils::TrackParents(const Object::Ptr& child) -{ - return Array::FromVector(DependencyGraph::GetChildren(dynamic_pointer_cast(child))); -} - double ScriptUtils::Ptr(const Object::Ptr& object) { return reinterpret_cast(object.get()); diff --git a/lib/base/scriptutils.hpp b/lib/base/scriptutils.hpp index 7bd3e8b9d..a16d46f74 100644 --- a/lib/base/scriptutils.hpp +++ b/lib/base/scriptutils.hpp @@ -39,7 +39,6 @@ public: static Array::Ptr GetObjects(const Type::Ptr& type); static void Assert(const Value& arg); static String MsiGetComponentPathShim(const String& component); - static Array::Ptr TrackParents(const Object::Ptr& parent); static double Ptr(const Object::Ptr& object); static Value Glob(const std::vector& args); static Value GlobRecursive(const std::vector& args); diff --git a/lib/icinga/CMakeLists.txt b/lib/icinga/CMakeLists.txt index 8187d48e8..2286fec94 100644 --- a/lib/icinga/CMakeLists.txt +++ b/lib/icinga/CMakeLists.txt @@ -30,7 +30,7 @@ set(icinga_SOURCES checkable.cpp checkable.hpp checkable-ti.hpp checkable-check.cpp checkable-comment.cpp checkable-dependency.cpp checkable-downtime.cpp checkable-event.cpp checkable-flapping.cpp - checkable-notification.cpp checkable-script.cpp + checkable-notification.cpp checkcommand.cpp checkcommand.hpp checkcommand-ti.hpp checkresult.cpp checkresult.hpp checkresult-ti.hpp cib.cpp cib.hpp diff --git a/lib/icinga/checkable-script.cpp b/lib/icinga/checkable-script.cpp deleted file mode 100644 index a455440ca..000000000 --- a/lib/icinga/checkable-script.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */ - -#include "icinga/checkable.hpp" -#include "base/configobject.hpp" -#include "base/dictionary.hpp" -#include "base/function.hpp" -#include "base/functionwrapper.hpp" -#include "base/scriptframe.hpp" -#include "remote/apilistener.hpp" - -using namespace icinga; - -static void CheckableProcessCheckResult(const CheckResult::Ptr& cr) -{ - ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); - Checkable::Ptr self = vframe->Self; - REQUIRE_NOT_NULL(self); - - if (cr) { - auto api (ApiListener::GetInstance()); - - self->ProcessCheckResult(cr, api ? api->GetWaitGroup() : new StoppableWaitGroup()); - } -} - -Object::Ptr Checkable::GetPrototype() -{ - static Dictionary::Ptr prototype = new Dictionary({ - { "process_check_result", new Function("Checkable#process_check_result", CheckableProcessCheckResult, { "cr" }, false) } - }); - - return prototype; -} diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 242139bc9..dbe73fe55 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -12,7 +12,7 @@ using namespace icinga; -REGISTER_TYPE_WITH_PROTOTYPE(Checkable, Checkable::GetPrototype()); +REGISTER_TYPE(Checkable); INITIALIZE_ONCE(&Checkable::StaticInitialize); const std::map Checkable::m_FlappingStateFilterMap ({ diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index e4403dadd..2ccc87073 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -216,8 +216,6 @@ public: static int GetPendingChecks(); static void AquirePendingCheckSlot(int maxPendingChecks); - static Object::Ptr GetPrototype(); - protected: void Start(bool runtimeCreated) override; void OnConfigLoaded() override;