resurrected_god 0.14.0 → 1.0.0

data/lib/god/contacts/statsd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Send a notice to statsd
 #
 # host - statsd host
@@ -7,7 +9,6 @@ require 'statsd-ruby'
 
 module God
   module Contacts
-
     class Statsd < Contact
       class << self
         attr_accessor :host, :port
@@ -21,16 +22,16 @@ module God
         valid
       end
 
-      def notify(message, time, priority, category, hostname)
+      def notify(message, _time, _priority, _category, hostname)
         statsd = ::Statsd.new host, (port ? port.to_i : 8125) # 8125 is the default statsd port
 
-        hostname.gsub! /\./, '_'
-        app = message.gsub /([^\s]*).*/, '\1'
+        hostname = hostname.tr('.', '_')
+        app = message.gsub(/([^\s]*).*/, '\1')
 
         [
-            'cpu out of bounds',
-            'memory out of bounds',
-            'process is flapping'
+          'cpu out of bounds',
+          'memory out of bounds',
+          'process is flapping'
         ].each do |event_type|
           statsd.increment "god.#{event_type.gsub(/\s/, '_')}.#{hostname}.#{app}" if message.include? event_type
         end
@@ -41,6 +42,5 @@ module God
         applog(nil, :debug, e.backtrace.join("\n"))
       end
     end
-
   end
 end

data/lib/god/contacts/twitter.rb

@@ -35,13 +35,13 @@ module God
       attr_accessor :consumer_token, :consumer_secret,
                     :access_token, :access_secret
 
-      def notify(message, time, priority, category, host)
+      def notify(message, _time, _priority, _category, _host)
         oauth = ::Twitter::OAuth.new(arg(:consumer_token), arg(:consumer_secret))
         oauth.authorize_from_access(arg(:access_token), arg(:access_secret))
 
         ::Twitter::Base.new(oauth).update(message)
 
-        self.info = "sent twitter update"
+        self.info = 'sent twitter update'
       rescue => e
         applog(nil, :info, "failed to send twitter update: #{e.message}")
         applog(nil, :debug, e.backtrace.join("\n"))

data/lib/god/contacts/webhook.rb

@@ -13,7 +13,6 @@ end
 
 module God
   module Contacts
-
     class Webhook < Contact
       class << self
         attr_accessor :url, :format
@@ -32,43 +31,41 @@ module God
 
       def notify(message, time, priority, category, host)
         data = {
-          :message => message,
-          :time => time,
-          :priority => priority,
-          :category => category,
-          :host => host
+          message: message,
+          time: time,
+          priority: priority,
+          category: category,
+          host: host
         }
 
         uri = URI.parse(arg(:url))
         http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true if uri.scheme == "https"
-
-        req = nil
-        res = nil
+        http.use_ssl = true if uri.scheme == 'https'
 
         case arg(:format)
-          when :form
-            req = Net::HTTP::Post.new(uri.request_uri)
-            req.set_form_data(data)
-          when :json
-            req = Net::HTTP::Post.new(uri.request_uri)
-            req.body = data.to_json
+        when :form
+          req = Net::HTTP::Post.new(uri.request_uri)
+          req.set_form_data(data)
+        when :json
+          req = Net::HTTP::Post.new(uri.request_uri)
+          req.body = data.to_json
+        else
+          # This line is unreachable
+          raise 'Condition is invalid'
         end
 
         res = http.request(req)
 
-        case res
-          when Net::HTTPSuccess
-            self.info = "sent webhook to #{arg(:url)}"
-          else
-            self.info = "failed to send webhook to #{arg(:url)}: #{res.error!}"
-        end
+        self.info = case res
+                    when Net::HTTPSuccess
+                      "sent webhook to #{arg(:url)}"
+                    else
+                      "failed to send webhook to #{arg(:url)}: #{res.error!}"
+                    end
       rescue Object => e
         applog(nil, :info, "failed to send webhook to #{arg(:url)}: #{e.message}")
         applog(nil, :debug, e.backtrace.join("\n"))
       end
-
     end
-
   end
 end

data/lib/god/driver.rb

@@ -1,10 +1,5 @@
 require 'monitor'
 
-# Ruby 1.9.1 specific fixes.
-if RUBY_VERSION.between?('1.9', '1.9.1')
-  require 'god/compat19'
-end
-
 module God
   # The TimedEvent class represents an event in the future. This class is used
   # by the drivers to schedule upcoming conditional tests and other scheduled
@@ -28,7 +23,7 @@ module God
     #
     # Returns true if the event is due, false if not.
     def due?
-      Time.now >= self.at
+      Time.now >= at
     end
 
     # Compare this event to another.
@@ -38,7 +33,7 @@ module God
     # Returns -1 if this event is before the other, 0 if the two events are
     #   due at the same time, 1 if the other event is later.
     def <=>(other)
-      self.at <=> other.at
+      at <=> other.at
     end
   end
 
@@ -116,7 +111,8 @@ module God
     def pop
       @monitor.synchronize do
         if @events.empty?
-          raise ThreadError, "queue empty" if @shutdown
+          raise ThreadError, 'queue empty' if @shutdown
+
           @resource.wait
         else
           delay = @events.first.at - Time.now
@@ -177,16 +173,14 @@ module God
 
       @thread = Thread.new do
         loop do
-          begin
-            @events.pop.handle_event
-          rescue ThreadError => e
-            # queue is empty
-            break
-          rescue Object => e
-            message = format("Unhandled exception in driver loop - (%s): %s\n%s",
-                             e.class, e.message, e.backtrace.join("\n"))
-            applog(nil, :fatal, message)
-          end
+          @events.pop.handle_event
+        rescue ThreadError
+          # queue is empty
+          break
+        rescue Object => e
+          message = format("Unhandled exception in driver loop - (%{class}): %{message}\n%{backtrace}",
+                           class: e.class, message: e.message, backtrace: e.backtrace.join("\n"))
+          applog(nil, :fatal, message)
         end
       end
     end

data/lib/god/errors.rb

@@ -1,5 +1,4 @@
 module God
-
   class AbstractMethodNotOverriddenError < StandardError
   end
 
@@ -20,5 +19,4 @@ module God
 
   class EventRegistrationFailedError < StandardError
   end
-
 end

data/lib/god/event_handler.rb

@@ -13,23 +13,21 @@ module God
     end
 
     def self.load
-      begin
-        case RUBY_PLATFORM
-        when /darwin/i, /bsd/i
-          require 'god/event_handlers/kqueue_handler'
-          @@handler = KQueueHandler
-        when /linux/i
-          require 'god/event_handlers/netlink_handler'
-          @@handler = NetlinkHandler
-        else
-          raise NotImplementedError, "Platform not supported for EventHandler"
-        end
-        @@loaded = true
-      rescue Exception
-        require 'god/event_handlers/dummy_handler'
-        @@handler = DummyHandler
-        @@loaded = false
+      case RUBY_PLATFORM
+      when /darwin/i, /bsd/i
+        require 'god/event_handlers/kqueue_handler'
+        @@handler = KQueueHandler
+      when /linux/i
+        require 'god/event_handlers/netlink_handler'
+        @@handler = NetlinkHandler
+      else
+        raise NotImplementedError, 'Platform not supported for EventHandler'
       end
+      @@loaded = true
+    rescue Exception
+      require 'god/event_handlers/dummy_handler'
+      @@handler = DummyHandler
+      @@loaded = false
     end
 
     def self.register(pid, event, &block)
@@ -39,12 +37,12 @@ module God
     end
 
     def self.deregister(pid, event)
-      if watching_pid? pid
-        running = ::Process.kill(0, pid.to_i) rescue false
-        @@actions[pid].delete(event)
-        @@handler.register_process(pid, @@actions[pid].keys) if running
-        @@actions.delete(pid) if @@actions[pid].empty?
-      end
+      return unless watching_pid?(pid)
+
+      running = ::Process.kill(0, pid.to_i) rescue false
+      @@actions[pid].delete(event)
+      @@handler.register_process(pid, @@actions[pid].keys) if running
+      @@actions.delete(pid) if @@actions[pid].empty?
     end
 
     def self.call(pid, event, extra_data = {})
@@ -58,55 +56,48 @@ module God
     def self.start
       @@thread = Thread.new do
         loop do
-          begin
-            @@handler.handle_events
-          rescue Exception => e
-            message = format("Unhandled exception (%s): %s\n%s",
-                             e.class, e.message, e.backtrace.join("\n"))
-            applog(nil, :fatal, message)
-          end
+          @@handler.handle_events
+        rescue Exception => e
+          message = format("Unhandled exception (%{class}): %{message}\n%{backtrace}",
+                           class: e.class, message: e.message, backtrace: e.backtrace.join("\n"))
+          applog(nil, :fatal, message)
         end
       end
 
       # do a real test to make sure events are working properly
-      @@loaded = self.operational?
+      @@loaded = operational?
     end
 
     def self.stop
-      @@thread.kill if @@thread
+      @@thread&.kill
     end
 
     def self.operational?
       com = [false]
 
       Thread.new do
-        begin
-          event_system = God::EventHandler.event_system
-
-          pid = fork do
-            loop { sleep(1) }
-          end
+        pid = fork do
+          loop { sleep(1) }
+        end
 
-          self.register(pid, :proc_exit) do
-            com[0] = true
-          end
+        register(pid, :proc_exit) do
+          com[0] = true
+        end
 
-          ::Process.kill('KILL', pid)
-          ::Process.waitpid(pid)
+        ::Process.kill('KILL', pid)
+        ::Process.waitpid(pid)
 
-          sleep(0.1)
+        sleep(0.1)
 
-          self.deregister(pid, :proc_exit) rescue nil
-        rescue => e
-          puts e.message
-          puts e.backtrace.join("\n")
-        end
+        deregister(pid, :proc_exit) rescue nil
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
       end.join
 
       sleep(0.1)
 
       com.first
     end
-
   end
 end

data/lib/god/event_handlers/dummy_handler.rb

@@ -1,6 +1,6 @@
 module God
   class DummyHandler
-    EVENT_SYSTEM = "none"
+    EVENT_SYSTEM = 'none'.freeze
 
     def self.register_process(pid, events)
       raise NotImplementedError

data/lib/god/event_handlers/kqueue_handler.rb

@@ -2,7 +2,7 @@ require 'kqueue_handler_ext'
 
 module God
   class KQueueHandler
-    EVENT_SYSTEM = "kqueue"
+    EVENT_SYSTEM = 'kqueue'.freeze
 
     def self.register_process(pid, events)
       monitor_process(pid, events_mask(events))
@@ -10,7 +10,7 @@ module God
 
     def self.events_mask(events)
       events.inject(0) do |mask, event|
-        mask |= event_mask(event)
+        mask | event_mask(event)
       end
     end
   end

data/lib/god/event_handlers/netlink_handler.rb

@@ -2,7 +2,7 @@ require 'netlink_handler_ext'
 
 module God
   class NetlinkHandler
-    EVENT_SYSTEM = "netlink"
+    EVENT_SYSTEM = 'netlink'.freeze
 
     def self.register_process(pid, events)
       # netlink doesn't need to do this

data/lib/god/logger.rb

@@ -1,7 +1,5 @@
 module God
-
   class Logger < SimpleLogger
-
     attr_accessor :logs
 
     class << self
@@ -22,7 +20,6 @@ module God
       @templog.level = Logger::INFO
     end
 
-
     def level=(lev)
       SysLogger.level = SimpleLogger::CONSTANT_TO_SYMBOL[lev] if Logger.syslog
       super(lev)
@@ -36,7 +33,7 @@ module God
     # Returns nothing
     def log(watch, level, text)
       # initialize watch log if necessary
-      self.logs[watch.name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT) if watch
+      logs[watch.name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT) if watch
 
       # push onto capture and timeline for the given watch
       if @capture || (watch && (Time.now - @spool < 2))
@@ -50,13 +47,13 @@ module God
           if @capture
             @capture.puts(message)
           else
-            self.logs[watch.name] << [Time.now, message]
+            logs[watch.name] << [Time.now, message]
           end
         end
       end
 
       # send to regular logger
-      self.send(level, text)
+      send(level, text)
 
       # send to syslog
       SysLogger.log(level, text) if Logger.syslog
@@ -69,16 +66,12 @@ module God
     # Returns String
     def watch_log_since(watch_name, since)
       # initialize watch log if necessary
-      self.logs[watch_name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT)
+      logs[watch_name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT)
 
       # get and join lines since given time
       @mutex.synchronize do
         @spool = Time.now
-        self.logs[watch_name].select do |x|
-          x.first > since
-        end.map do |x|
-          x[1]
-        end.join
+        logs[watch_name].select { |x| x.first > since }.map { |x| x[1] }.join
       end
     end
 
@@ -105,5 +98,4 @@ module God
       end
     end
   end
-
 end

data/lib/god/metric.rb

@@ -32,7 +32,7 @@ module God
     def condition(kind)
       # Create the condition.
       begin
-        c = Condition.generate(kind, self.watch)
+        c = Condition.generate(kind, watch)
       rescue NoSuchConditionError => e
         abort e.message
       end
@@ -44,24 +44,22 @@ module God
       c.prepare
 
       # Test generic and specific validity.
-      unless Condition.valid?(c) && c.valid?
-        abort "Exiting on invalid condition"
-      end
+      abort 'Exiting on invalid condition' unless Condition.valid?(c) && c.valid?
 
       # Inherit interval from watch if no poll condition specific interval was
       # set.
-      if c.kind_of?(PollCondition) && !c.interval
-        if self.watch.interval
-          c.interval = self.watch.interval
+      if c.is_a?(PollCondition) && !c.interval
+        if watch.interval
+          c.interval = watch.interval
         else
-          abort "No interval set for Condition '#{c.class.name}' in Watch " +
-                "'#{self.watch.name}', and no default Watch interval from " +
-                "which to inherit."
+          abort "No interval set for Condition '#{c.class.name}' in Watch " \
+                "'#{watch.name}', and no default Watch interval from " \
+                'which to inherit.'
         end
       end
 
       # Add the condition to the list.
-      self.conditions << c
+      conditions << c
     end
 
     # Enable all of this Metric's conditions. Poll conditions will be
@@ -69,8 +67,8 @@ module God
     #
     # Returns nothing.
     def enable
-      self.conditions.each do |c|
-        self.watch.attach(c)
+      conditions.each do |c|
+        watch.attach(c)
       end
     end
 
@@ -79,8 +77,8 @@ module God
     #
     # Returns nothing.
     def disable
-      self.conditions.each do |c|
-        self.watch.detach(c)
+      conditions.each do |c|
+        watch.detach(c)
       end
     end
   end