resurrected_god 0.14.0 → 1.0.0

data/bin/god

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-STDOUT.sync = true
+$stdout.sync = true
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'optparse'
 require 'drb'
@@ -12,10 +12,10 @@ begin
   # Save ARGV in case someone wants to use it later
   ORIGINAL_ARGV = ARGV.dup
 
-  options = {:daemonize => true, :port => 17165, :syslog => true, :events => true}
+  options = { daemonize: true, port: 17165, syslog: true, events: true }
 
-  opts = OptionParser.new do |opts|
-    opts.banner = <<-EOF
+  opts = OptionParser.new do |o|
+    o.banner = <<-BANNER
   Usage:
     Starting:
       god [-c <config file>] [-p <port> | -b] [-P <file>] [-l <file>] [-D]
@@ -42,57 +42,57 @@ begin
       check                              run self diagnostic
 
     Options:
-  EOF
+    BANNER
 
-    opts.on("-cCONFIG", "--config-file CONFIG", "Configuration file") do |x|
+    o.on('-cCONFIG', '--config-file CONFIG', 'Configuration file') do |x|
       options[:config] = x
     end
 
-    opts.on("-pPORT", "--port PORT", "Communications port (default 17165)") do |x|
+    o.on('-pPORT', '--port PORT', 'Communications port (default 17165)') do |x|
       options[:port] = x
     end
 
-    opts.on("-b", "--auto-bind", "Auto-bind to an unused port number") do
-      options[:port] = "0"
+    o.on('-b', '--auto-bind', 'Auto-bind to an unused port number') do
+      options[:port] = '0'
     end
 
-    opts.on("-PFILE", "--pid FILE", "Where to write the PID file") do |x|
+    o.on('-PFILE', '--pid FILE', 'Where to write the PID file') do |x|
       options[:pid] = x
     end
 
-    opts.on("-lFILE", "--log FILE", "Where to write the log file") do |x|
+    o.on('-lFILE', '--log FILE', 'Where to write the log file') do |x|
       options[:log] = x
     end
 
-    opts.on("-D", "--no-daemonize", "Don't daemonize") do
+    o.on('-D', '--no-daemonize', "Don't daemonize") do
       options[:daemonize] = false
     end
 
-    opts.on("-v", "--version", "Print the version number and exit") do
+    o.on('-v', '--version', 'Print the version number and exit') do
       options[:version] = true
     end
 
-    opts.on("-V", "Print extended version and build information") do
+    o.on('-V', 'Print extended version and build information') do
       options[:info] = true
     end
 
-    opts.on("--log-level LEVEL", "Log level [debug|info|warn|error|fatal]") do |x|
+    o.on('--log-level LEVEL', 'Log level [debug|info|warn|error|fatal]') do |x|
       options[:log_level] = x.to_sym
     end
 
-    opts.on("--no-syslog", "Disable output to syslog") do
+    o.on('--no-syslog', 'Disable output to syslog') do
       options[:syslog] = false
     end
 
-    opts.on("--attach PID", "Quit god when the attached process dies") do |x|
+    o.on('--attach PID', 'Quit god when the attached process dies') do |x|
       options[:attach] = x
     end
 
-    opts.on("--no-events", "Disable the event system") do
+    o.on('--no-events', 'Disable the event system') do
       options[:events] = false
     end
 
-    opts.on("--bleakhouse", "Enable bleakhouse profiling") do
+    o.on('--bleakhouse', 'Enable bleakhouse profiling') do
       options[:bleakhouse] = true
     end
   end
@@ -115,7 +115,7 @@ begin
     require 'god'
     God::EventHandler.load
     God::CLI::Version.version_extended
-  elsif !options[:config] && command = ARGV[0]
+  elsif !options[:config] && (command = ARGV[0])
     require 'god'
     God::EventHandler.load
     God::CLI::Command.new(command, options, ARGV)
@@ -124,11 +124,9 @@ begin
     God::CLI::Run.new(options)
   end
 rescue Exception => e
-  if e.instance_of?(SystemExit)
-    raise
-  else
-    puts 'Uncaught exception'
-    puts e.message
-    puts e.backtrace.join("\n")
-  end
+  raise if e.instance_of?(SystemExit)
+
+  puts 'Uncaught exception'
+  puts e.message
+  puts e.backtrace.join("\n")
 end

data/ext/god/extconf.rb

@@ -3,9 +3,9 @@ require 'mkmf'
 fail = false
 
 def create_dummy_makefile
-  File.open("Makefile", 'w') do |f|
-    f.puts "all:"
-    f.puts "install:"
+  File.open('Makefile', 'w') do |f|
+    f.puts 'all:'
+    f.puts 'install:'
   end
 end
 
@@ -20,7 +20,7 @@ when /bsd/i, /darwin/i
 
   if fail
     puts
-    puts "Events handler could not be compiled (see above error). Your god installation will not support event conditions."
+    puts 'Events handler could not be compiled (see above error). Your god installation will not support event conditions.'
     create_dummy_makefile
   else
     create_makefile 'kqueue_handler_ext'
@@ -29,21 +29,21 @@ when /linux/i
   unless have_header('linux/netlink.h')
     puts
     puts "Missing 'linux/netlink.h' header(s)"
-    puts "You may need to install a header package for your system"
+    puts 'You may need to install a header package for your system'
     fail = true
   end
 
   unless have_header('linux/connector.h') && have_header('linux/cn_proc.h')
     puts
     puts "Missing 'linux/connector.h', or 'linux/cn_proc.h' header(s)"
-    puts "These are only available in Linux kernel 2.6.15 and later (run `uname -a` to find yours)"
-    puts "You may need to install a header package for your system"
+    puts 'These are only available in Linux kernel 2.6.15 and later (run `uname -a` to find yours)'
+    puts 'You may need to install a header package for your system'
     fail = true
   end
 
   if fail
     puts
-    puts "Events handler could not be compiled (see above error). Your god installation will not support event conditions."
+    puts 'Events handler could not be compiled (see above error). Your god installation will not support event conditions.'
     create_dummy_makefile
   else
     create_makefile 'netlink_handler_ext'
@@ -51,6 +51,6 @@ when /linux/i
 else
   puts
   puts "Unsupported platform '#{RUBY_PLATFORM}'. Supported platforms are BSD, DARWIN, and LINUX."
-  puts "Your god installation will not support event conditions."
+  puts 'Your god installation will not support event conditions.'
   create_dummy_makefile
 end

data/lib/god/behavior.rb

@@ -1,5 +1,4 @@
 module God
-
   class Behavior
     include Configurable
 
@@ -9,12 +8,12 @@ module God
     # kind (which is given as an underscored symbol).
     #   +kind+ is the underscored symbol representing the class (e.g. foo_bar for God::Behaviors::FooBar)
     def self.generate(kind, watch)
-      sym = kind.to_s.capitalize.gsub(/_(.)/){$1.upcase}.intern
+      sym = kind.to_s.capitalize.gsub(/_(.)/) { Regexp.last_match(1).upcase }.intern
       b = God::Behaviors.const_get(sym).new
       b.watch = watch
       b
     rescue NameError
-      raise NoSuchBehaviorError.new("No Behavior found with the class name God::Behaviors::#{sym}")
+      raise NoSuchBehaviorError, "No Behavior found with the class name God::Behaviors::#{sym}"
     end
 
     def valid?
@@ -45,8 +44,7 @@ module God
     #
     # Behavior FooBar on Watch 'baz'
     def friendly_name
-      "Behavior " + super + " on Watch '#{self.watch.name}'"
+      "Behavior #{super} on Watch '#{watch.name}'"
     end
   end
-
 end

data/lib/god/behaviors/clean_pid_file.rb

@@ -1,21 +1,19 @@
 module God
   module Behaviors
-
     class CleanPidFile < Behavior
       def valid?
         valid = true
-        valid &= complain("Attribute 'pid_file' must be specified", self) if self.watch.pid_file.nil?
+        valid &= complain("Attribute 'pid_file' must be specified", self) if watch.pid_file.nil?
         valid
       end
 
       def before_start
-        File.delete(self.watch.pid_file)
+        File.delete(watch.pid_file)
 
-        "deleted pid file"
+        'deleted pid file'
       rescue
-        "no pid file to delete"
+        'no pid file to delete'
       end
     end
-
   end
 end

data/lib/god/behaviors/clean_unix_socket.rb

@@ -1,21 +1,19 @@
 module God
   module Behaviors
-
     class CleanUnixSocket < Behavior
       def valid?
         valid = true
-        valid &= complain("Attribute 'unix_socket' must be specified", self) if self.watch.unix_socket.nil?
+        valid &= complain("Attribute 'unix_socket' must be specified", self) if watch.unix_socket.nil?
         valid
       end
 
       def before_start
-        File.delete(self.watch.unix_socket)
+        File.delete(watch.unix_socket)
 
-        "deleted unix socket"
+        'deleted unix socket'
       rescue
-        "no unix socket to delete"
+        'no unix socket to delete'
       end
     end
-
   end
 end

data/lib/god/behaviors/notify_when_flapping.rb

@@ -1,10 +1,9 @@
 module God
   module Behaviors
-
     class NotifyWhenFlapping < Behavior
-      attr_accessor :failures # number of failures
-      attr_accessor :seconds  # number of seconds
-      attr_accessor :notifier # class to notify with
+      attr_accessor :failures, # number of failures
+                    :seconds, # number of seconds
+                    :notifier # class to notify with
 
       def initialize
         super
@@ -13,12 +12,12 @@ module God
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'failures' must be specified", self) unless self.failures
-        valid &= complain("Attribute 'seconds' must be specified", self) unless self.seconds
-        valid &= complain("Attribute 'notifier' must be specified", self) unless self.notifier
+        valid &= complain("Attribute 'failures' must be specified", self) unless failures
+        valid &= complain("Attribute 'seconds' must be specified", self) unless seconds
+        valid &= complain("Attribute 'notifier' must be specified", self) unless notifier
 
         # Must take one arg or variable args
-        unless self.notifier.respond_to?(:notify) and [1,-1].include?(self.notifier.method(:notify).arity)
+        unless notifier.respond_to?(:notify) && [1, -1].include?(notifier.method(:notify).arity)
           valid &= complain("The 'notifier' must have a method 'notify' which takes 1 or variable args", self)
         end
 
@@ -39,13 +38,12 @@ module God
 
       private
 
-        def check_for_flapping(now)
-          @startup_times.select! {|time| time >= now - self.seconds }
-          if @startup_times.length >= self.failures
-            self.notifier.notify("#{self.watch.name} has called start/restart #{@startup_times.length} times in #{self.seconds} seconds")
-          end
-        end
-    end
+      def check_for_flapping(now)
+        @startup_times.select! { |time| time >= now - seconds }
+        return if @startup_times.length < failures
 
+        notifier.notify("#{watch.name} has called start/restart #{@startup_times.length} times in #{seconds} seconds")
+      end
+    end
   end
 end

data/lib/god/cli/command.rb

@@ -1,6 +1,5 @@
 module God
   module CLI
-
     class Command
       def initialize(command, options, args)
         @command = command
@@ -18,16 +17,16 @@ module God
         begin
           @server.ping
         rescue DRb::DRbConnError
-          puts "The server is not available (or you do not have permissions to access it)"
+          puts 'The server is not available (or you do not have permissions to access it)'
           abort
         end
       end
 
       def dispatch
-        if %w{load status signal log quit terminate}.include?(@command)
+        if %w[load status signal log quit terminate].include?(@command)
           setup
           send("#{@command}_command")
-        elsif %w{start stop restart monitor unmonitor remove}.include?(@command)
+        elsif %w[start stop restart monitor unmonitor remove].include?(@command)
           setup
           lifecycle_command
         elsif @command == 'check'
@@ -50,9 +49,7 @@ module God
         puts "Sending '#{@command}' command with action '#{action}'"
         puts
 
-        unless File.exist?(file)
-          abort "File not found: #{file}"
-        end
+        abort "File not found: #{file}" unless File.exist?(file)
 
         affected, errors, removed = *@server.running_load(File.read(file), File.expand_path(file), action)
 
@@ -60,21 +57,21 @@ module God
         unless affected.empty?
           puts 'The following tasks were affected:'
           affected.each do |w|
-            puts '  ' + w
+            puts "  #{w}"
           end
         end
 
         unless removed.empty?
           puts 'The following tasks were removed:'
           removed.each do |w|
-            puts '  ' + w
+            puts "  #{w}"
           end
         end
 
-        unless errors.empty?
-          puts errors
-          exit(1)
-        end
+        return if errors.empty?
+
+        puts errors
+        exit(1)
       end
 
       def status_command
@@ -87,18 +84,25 @@ module God
           groups[g][name] = status
         end
 
-        if item = @args[1]
-          if single = statuses[item]
+        if (item = @args[1])
+          if (single = statuses[item])
             # specified task (0 -> up, 1 -> unmonitored, 2 -> other)
             state = single[:state]
             puts "#{item}: #{state}"
-            exitcode = state == :up ? 0 : (state == :unmonitored ? 1 : 2)
+            exitcode = case state
+                       when :up
+                         0
+                       when :unmonitored
+                         1
+                       else
+                         2
+                       end
           elsif groups[item]
             # specified group (0 -> up, N -> other)
             puts "#{item}:"
             groups[item].keys.sort.each do |name|
               state = groups[item][name][:state]
-              print "  "
+              print '  '
               puts "#{name}: #{state}"
               exitcode += 1 unless state == :up
             end
@@ -112,7 +116,7 @@ module God
             puts "#{group}:" unless group.empty?
             groups[group].keys.sort.each do |name|
               state = groups[group][name][:state]
-              print "  " unless group.empty?
+              print '  ' unless group.empty?
               puts "#{name}: #{state}"
             end
           end
@@ -128,62 +132,73 @@ module God
 
         puts "Sending signal '#{signal}' to '#{name}'"
 
-        t = Thread.new { loop { sleep(1); STDOUT.print('.'); STDOUT.flush; sleep(1) } }
+        t = Thread.new do
+          loop do
+            sleep(1)
+            $stdout.print('.')
+            $stdout.flush
+            sleep(1)
+          end
+        end
 
         watches = @server.signal(name, signal)
 
         # output response
-        t.kill; STDOUT.puts
-        unless watches.empty?
+        t.kill
+        $stdout.puts
+        if watches.empty?
+          puts 'No matching task or group'
+        else
           puts 'The following watches were affected:'
           watches.each do |w|
-            puts '  ' + w
+            puts "  #{w}"
           end
-        else
-          puts 'No matching task or group'
         end
       end
 
       def log_command
-        begin
-          Signal.trap('INT') { exit }
-          name = @args[1]
+        Signal.trap('INT') { exit }
+        name = @args[1]
 
-          unless name
-            puts "You must specify a Task or Group name"
-            exit!
-          end
+        unless name
+          puts 'You must specify a Task or Group name'
+          exit!
+        end
 
-          puts "Please wait..."
-          t = Time.at(0)
-          loop do
-            print @server.running_log(name, t)
-            t = Time.now
-            sleep 0.25
-          end
-        rescue God::NoSuchWatchError
-          puts "No such watch"
-        rescue DRb::DRbConnError
-          puts "The server went away"
+        puts 'Please wait...'
+        t = Time.at(0)
+        loop do
+          print @server.running_log(name, t)
+          t = Time.now
+          sleep 0.25
         end
+      rescue God::NoSuchWatchError
+        puts 'No such watch'
+      rescue DRb::DRbConnError
+        puts 'The server went away'
       end
 
       def quit_command
-        begin
-          @server.terminate
-          abort 'Could not stop god'
-        rescue DRb::DRbConnError
-          puts 'Stopped god'
-        end
+        @server.terminate
+        abort 'Could not stop god'
+      rescue DRb::DRbConnError
+        puts 'Stopped god'
       end
 
       def terminate_command
-        t = Thread.new { loop { STDOUT.print('.'); STDOUT.flush; sleep(1) } }
-        if @server.stop_all
-          t.kill; STDOUT.puts
+        t = Thread.new do
+          loop do
+            $stdout.print('.')
+            $stdout.flush
+            sleep(1)
+          end
+        end
+        stopped = @server.stop_all
+        t.kill
+        $stdout.puts
+        if stopped
           puts 'Stopped all watches'
         else
-          t.kill; STDOUT.puts
           puts "Could not stop all watches within #{@server.terminate_timeout} seconds"
         end
 
@@ -197,46 +212,44 @@ module God
 
       def check_command
         Thread.new do
-          begin
-            event_system = God::EventHandler.event_system
-            puts "using event system: #{event_system}"
-
-            if God::EventHandler.loaded?
-              puts "starting event handler"
-              God::EventHandler.start
-            else
-              puts "[fail] event system did not load"
-              exit(1)
-            end
+          event_system = God::EventHandler.event_system
+          puts "using event system: #{event_system}"
 
-            puts 'forking off new process'
+          if God::EventHandler.loaded?
+            puts 'starting event handler'
+            God::EventHandler.start
+          else
+            puts '[fail] event system did not load'
+            exit(1)
+          end
 
-            pid = fork do
-              loop { sleep(1) }
-            end
+          puts 'forking off new process'
 
-            puts "forked process with pid = #{pid}"
+          pid = fork do
+            loop { sleep(1) }
+          end
 
-            God::EventHandler.register(pid, :proc_exit) do
-              puts "[ok] process exit event received"
-              exit!(0)
-            end
+          puts "forked process with pid = #{pid}"
 
-            sleep(1)
+          God::EventHandler.register(pid, :proc_exit) do
+            puts '[ok] process exit event received'
+            exit!(0)
+          end
 
-            puts "killing process"
+          sleep(1)
 
-            ::Process.kill('KILL', pid)
-            ::Process.waitpid(pid)
-          rescue => e
-            puts e.message
-            puts e.backtrace.join("\n")
-          end
+          puts 'killing process'
+
+          ::Process.kill('KILL', pid)
+          ::Process.waitpid(pid)
+        rescue => e
+          puts e.message
+          puts e.backtrace.join("\n")
         end
 
         sleep(2)
 
-        puts "[fail] never received process exit event"
+        puts '[fail] never received process exit event'
         exit(1)
       end
 
@@ -246,23 +259,30 @@ module God
 
         puts "Sending '#{@command}' command"
 
-        t = Thread.new { loop { sleep(1); STDOUT.print('.'); STDOUT.flush; sleep(1) } }
+        t = Thread.new do
+          loop do
+            sleep(1)
+            $stdout.print('.')
+            $stdout.flush
+            sleep(1)
+          end
+        end
 
         # send @command
         watches = @server.control(name, @command)
 
         # output response
-        t.kill; STDOUT.puts
-        unless watches.empty?
+        t.kill
+        $stdout.puts
+        if watches.empty?
+          puts 'No matching task or group'
+        else
           puts 'The following watches were affected:'
           watches.each do |w|
-            puts '  ' + w
+            puts "  #{w}"
           end
-        else
-          puts 'No matching task or group'
         end
       end
-    end # Command
-
+    end
   end
 end