Converted timeout to numeric

sensu · Feb 11, 2014 · 32f4d3b · 32f4d3b
1 parent 75ed403
commit 32f4d3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/puppet/provider/sensu_check/json.rb b/lib/puppet/provider/sensu_check/json.rb
@@ -132,8 +132,13 @@ def timeout
     conf['checks'][resource[:name]]['timeout'].to_s
   end
 
+  def trim num
+    i, f = num.to_i, num.to_f
+    i == f ? i : f
+  end
+
   def timeout=(value)
-    conf['checks'][resource[:name]]['timeout'] = value.to_f
+    conf['checks'][resource[:name]]['timeout'] = trim(value)
   end
 
   def aggregate

diff --git a/manifests/check.pp b/manifests/check.pp
@@ -41,7 +41,7 @@
 #   Default: undef
 #
 # [*timeout*]
-#   Integer.  Check timeout in seconds, after it fails
+#   Numeric.  Check timeout in seconds, after it fails
 #   Default: undef
 #
 # [*aggregate*]
@@ -86,8 +86,8 @@
   if $high_flap_threshold and !is_integer($high_flap_threshold) {
     fail("sensu::check{${name}}: high_flap_threshold must be an integer (got: ${high_flap_threshold})")
   }
-  if $timeout and !is_float($timeout) {
-    fail("sensu::check{${name}}: timeout must be an float (got: ${timeout})")
+  if $timeout and !is_numeric($timeout) {
+    fail("sensu::check{${name}}: timeout must be a numeric (got: ${timeout})")
   }
 
   $check_name = regsubst(regsubst($name, ' ', '_', 'G'), '[\(\)]', '', 'G')