From 9120db3f70bc772088aaa982071f6bbae6ab97d8 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 9 Mar 2016 18:12:01 +0100 Subject: [PATCH] IcingaCommand: allow formatted timeout (e.g. 1m 4s) refs #11340 --- library/Director/Objects/IcingaCommand.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/library/Director/Objects/IcingaCommand.php b/library/Director/Objects/IcingaCommand.php index 2d57e9f4..c1785973 100644 --- a/library/Director/Objects/IcingaCommand.php +++ b/library/Director/Objects/IcingaCommand.php @@ -29,6 +29,10 @@ class IcingaCommand extends IcingaObject protected $supportsArguments = true; + protected $intervalProperties = array( + 'timeout' => 'timeout', + ); + protected static $pluginDir; /** @@ -83,11 +87,6 @@ class IcingaCommand extends IcingaObject return c::renderKeyValue('command', c::renderArray($parts)); } - protected function renderTimeout() - { - return $this->renderPropertyAsSeconds('timeout'); - } - public static function setPluginDir($pluginDir) { self::$pluginDir = $pluginDir;