lib/riemann/babbler/support/plugin_helpers.rb in riemann-babbler-1.3.8 vs lib/riemann/babbler/support/plugin_helpers.rb in riemann-babbler-1.3.9

@@ -3,14 +3,15 @@
 module Riemann
   class Babbler
 
     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
       ( plugin.interval * 2 ).to_f/3
     end
@@ -32,10 +33,10 @@
       rescue => e
         helper_error "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
       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
         # статус 0, вывода stdout нет
         ''