]> granicus.if.org Git - icinga2/commitdiff
Don't allow retry_interval <= 0 6916/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Mon, 28 Jan 2019 16:33:05 +0000 (17:33 +0100)
committerMichael Friedrich <michael.friedrich@icinga.com>
Mon, 28 Jan 2019 16:33:05 +0000 (17:33 +0100)
lib/icinga/checkable.cpp
lib/icinga/checkable.hpp

index fe2fed9e31330b32ad8ab0ff81f353bb05c040bb..e745d76cb3edd206b986832590c1a0d1a8aaa62a 100644 (file)
@@ -198,6 +198,14 @@ void Checkable::ValidateCheckInterval(const Lazy<double>& lvalue, const Validati
                BOOST_THROW_EXCEPTION(ValidationError(this, { "check_interval" }, "Interval must be greater than 0."));
 }
 
+void Checkable::ValidateRetryInterval(const Lazy<double>& lvalue, const ValidationUtils& utils)
+{
+       ObjectImpl<Checkable>::ValidateRetryInterval(lvalue, utils);
+
+       if (lvalue() <= 0)
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "retry_interval" }, "Interval must be greater than 0."));
+}
+
 void Checkable::ValidateMaxCheckAttempts(const Lazy<int>& lvalue, const ValidationUtils& utils)
 {
        ObjectImpl<Checkable>::ValidateMaxCheckAttempts(lvalue, utils);
index 141d0a43c91bc1857895dc24f03c40e5c8610232..824f41b8d2184d53d1ddf3d9c818865f74924d0d 100644 (file)
@@ -192,6 +192,7 @@ public:
        std::vector<intrusive_ptr<Dependency> > GetReverseDependencies() const;
 
        void ValidateCheckInterval(const Lazy<double>& lvalue, const ValidationUtils& value) final;
+       void ValidateRetryInterval(const Lazy<double>& lvalue, const ValidationUtils& value) final;
        void ValidateMaxCheckAttempts(const Lazy<int>& lvalue, const ValidationUtils& value) final;
 
        static void IncreasePendingChecks();