lib/riemann/babbler/plugin.rb in riemann-babbler-0.8.8 vs lib/riemann/babbler/plugin.rb in riemann-babbler-0.8.9

@@ -35,11 +35,11 @@
       run
     end
 
     # Доступ к конфигу определенного плагина
     def plugin
-      plugin_name = self.class.name.split( "::" ).last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
+      plugin_name = self.class.name.split('::').last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
       options.plugins.send plugin_name
     end
 
     def options
       @configatron
@@ -76,11 +76,11 @@
       end
       # разбор инсталяции
       if options.riemann.installation.nil?
         hostname += options.riemann.suffix unless options.riemann.suffix.nil?
       else
-        hostname += ( "." + options.riemann.installation )
+        hostname += ( '.' + options.riemann.installation )
       end
       hostname = options.riemann.prefix + hostname unless options.riemann.prefix.nil?
       hostname
     end
 
@@ -100,11 +100,11 @@
     def init
     end
 
     def run
       # выйти если run_plugin не равен true
-      return 0 unless run_plugin == true
+      return 0 unless run_plugin
       t0 = Time.now
       loop do
         begin
           tick
         rescue => e
@@ -116,20 +116,20 @@
     end
 
     # хелпер, описание статуса
     def state(my_state)
       return 'critical' if my_state.nil?
-      unless plugin.states.warning.nil?
+      if plugin.states.warning.nil?
+        my_state >= plugin.states.critical ? 'critical' : 'ok'
+      else
         case
-        when my_state.between?(plugin.states.warning, plugin.states.critical)
-          'warning'
-        when my_state > plugin.states.warning
-          'critical'
-        else
-          'ok'
+          when my_state.between?(plugin.states.warning, plugin.states.critical)
+            'warning'
+          when my_state > plugin.states.warning
+            'critical'
+          else
+            'ok'
         end
-      else
-        my_state >= plugin.states.critical ? 'critical' : 'ok'
       end
     end
 
   end
 end