Merge pull request #10457 from Icinga/remove-superfluous-dsl-functions

Drop superfluous (broken) DSL functions

Author: julianbrost

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<ConfigObject>(child)));
-}
-
 double ScriptUtils::Ptr(const Object::Ptr& object)
 {
 	return reinterpret_cast<intptr_t>(object.get());

lib/base/scriptutils.hpp

@@ -39,7 +39,6 @@ class ScriptUtils
 	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<Value>& args);
 	static Value GlobRecursive(const std::vector<Value>& args);

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

lib/icinga/checkable-script.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<String, int> Checkable::m_FlappingStateFilterMap ({

lib/icinga/checkable.cpp

@@ -216,8 +216,6 @@ class Checkable : public ObjectImpl<Checkable>
 	static int GetPendingChecks();
 	static void AquirePendingCheckSlot(int maxPendingChecks);
 
-	static Object::Ptr GetPrototype();
-
 protected:
 	void Start(bool runtimeCreated) override;
 	void OnConfigLoaded() override;