riemann-babbler 1.3.8 → 1.3.9

data/lib/riemann/babbler/plugins/http.rb

@@ -22,7 +22,7 @@ class Riemann::Babbler::Http < Riemann::Babbler
     command += " -w '%{http_code}\\n'"
     command += " --retry #{plugin.retry} --retry-delay #{plugin.retry_delay}"
     command += " --max-time #{plugin.max_time} --fail"
-    command += " #{plugin.url} -o /dev/null"
+    command += " #{plugin.url} -o /dev/null || echo 1"
 
     out = shell(command).to_i
 

data/lib/riemann/babbler/support/errors.rb

@@ -0,0 +1,3 @@
+class Riemann::Babbler::PluginHelperError < StandardError
+
+end

data/lib/riemann/babbler/support/plugin_helpers.rb

@@ -5,10 +5,11 @@ module Riemann
 
     def helper_error(msg = 'Unknown helper error')
       report({
-               :service => plugin.service,
-               :state => 'critical',
-               :description => msg
+        :service => plugin.service,
+        :state => 'critical',
+        :description => msg
       })
+      raise Riemann::Babbler::PluginHelperError
     end
 
     def plugin_timeout
@@ -34,7 +35,7 @@ module Riemann
       end
       if exit_status.to_i > 0
         err = err.chomp if err
-        helper_error(err)
+        helper_error("Error while running shell: " + err.to_s)
       elsif out
         return out.strip
       else

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.3.8'
+    VERSION = '1.3.9'
   end
 end

data/lib/riemann/babbler.rb

@@ -9,6 +9,7 @@ require 'socket'
 require 'net/ping'
 require 'file/tail'
 require 'riemann/babbler/support/monkey_patches'
+require 'riemann/babbler/support/errors'
 
 
 # Базовое описание плагина
@@ -117,7 +118,7 @@ module Riemann
       # error - текущая ошибка, @has_last_error - предыдущая
       # две переменные для того что бы не удвоить сообщения об 'ОК'
       return 0 unless run_plugin
-      error = true
+      error = false
       t0 = Time.now
       loop do
 
@@ -126,11 +127,14 @@ module Riemann
         rescue TimeoutError
           report({:state => 'critical', :service => plugin.service + " plugin errors", :description => "Broken plugin: deadlock"})
           logger.error("Plugin #{self.class.name} timed out!")
+          error = true
+        rescue Riemann::Babbler::PluginHelperError
+          logger.error("Plugin helper error!")
+          error = true
         rescue => e
           report({:state => 'critical', :service => plugin.service + " plugin errors", :description => "Plugin exception: #{e.class}\n #{e.backtrace.join "\n"}"})
           logger.error("Plugin #{self.class.name} : #{e.class} #{e}\n#{e.backtrace.join "\n"}")
-        else
-          error = false
+          error = true
         end
 
         report({:state => 'ok', :service => plugin.service + " plugin errors"}) if (not error && @has_last_error)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -212,6 +212,7 @@ files:
 - lib/riemann/babbler/plugins/tw_cli.rb
 - lib/riemann/babbler/start.rb
 - lib/riemann/babbler/support/deep_merge.rb
+- lib/riemann/babbler/support/errors.rb
 - lib/riemann/babbler/support/monkey_patches.rb
 - lib/riemann/babbler/support/plugin_helpers.rb
 - lib/riemann/babbler/support/responder.rb