unicorn-wrangler 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467ba192f3c2102dbc67f8fa957081576ca2e1a0
-  data.tar.gz: 0e3fc78a240edc9c0c0982d60dc2579ecffff3a6
+  metadata.gz: 14daf7ce37b1e4cdc63918f515f1692df2d98288
+  data.tar.gz: bd3ad398853fb679a09063fe23e1fda243e1ffdb
 SHA512:
-  metadata.gz: 5e7eebda41d84eb9a914a93ad9d8914591963877d8cc5d51c9d42b0e838f026e763317b8db0deccc9b316a5c5cbb3176ea9a2c72137ea5a9af02e7ee808d7c24
-  data.tar.gz: 428f1680fea401c017cc88f6371457bcdf24cbd8dc2a14ad6035faa5adfd561cdfe7dc1317af53ea178f47864854325f7213421b97fceeebb1a5eb93a2c2e304
+  metadata.gz: ff65b1fd38f6c10e67949ed25496d3bdc78bd56b6def232bda911f3f0c55198791ae8b676046e4c6e93a7b51d416691ad15696dc673981ded7df782c30c82c2e
+  data.tar.gz: 4188b4cecd023e45041fcd8a19e5ff5171cea6f328314678cb72ade2e055944b9f82a95b0acdf1029a93c9feada53f9ef7ad195e611591af777eb903884e98e3

data/bin/unicorn-wrangler

@@ -22,5 +22,5 @@ OptionParser.new do |opts|
   end
 end.parse!(ARGV[0...command_index])
 
-launcher = Unicorn::Wrangler.new command, options
+launcher = Unicorn::Wrangler::Main.new command, options
 launcher.start

data/lib/unicorn/wrangler.rb

@@ -1,19 +1,47 @@
-require "unicorn/wrangler/version"
+require 'unicorn/wrangler/version'
+require 'logger'
 
 module Unicorn
   class Wrangler
-    attr_reader :command, :pidfile, :grace_period
-    attr_accessor :unicorn
-
-    def initialize(command, options = {})
-      @command = command
-      @pidfile = File.expand_path(options[:pidfile] || 'unicorn.pid')
-      @grace_period = options[:grace_period] || 60
-      @verbose = options[:verbose]
-      @unicorn = UnicornProcess.from_pidfile(@pidfile)
+    class << self
+      def logger
+        @logger ||= Logger.new(STDOUT)
+      end
+    end
+
+    module Utils
+      def warn(message)
+        Wrangler.logger.warn(message)
+      end
+
+      def debug(message)
+        Thread.new do
+          Wrangler.logger.debug(message)
+        end.join
+      end
+
+      def trap_signals(*signals, &block)
+        signals.map(&:to_s).each do |signal|
+          trap(signal) do
+            debug "received #{signal} (watching #{unicorn.pid})"
+            block.call signal
+          end
+        end
+      end
+
+      def wait_for(seconds, &block)
+        end_time = Time.now + seconds
+        until Time.now > end_time || block.call
+          sleep 0.1
+        end
+        block.call
+      end
     end
 
     class UnicornProcess
+      extend Utils
+      include Utils
+
       attr_reader :pid, :pidfile
 
       def initialize(pidfile)
@@ -29,30 +57,40 @@ module Unicorn
       end
 
       def signal(msg)
-        puts "Sending signal #{msg} to #{pid}"
-        Process.kill msg, pid
+        debug "Sending signal #{msg} to #{pid}"
+        Process.kill msg.to_s, pid
       end
 
       def reload(grace_period)
-        signal "USR2"
-        sleep grace_period
-        reloaded_unicorn = UnicornProcess.from_pidfile(pidfile)
-        if reloaded_unicorn && pid != reloaded_unicorn.pid
-          terminate
+        signal :USR2
+        if wait_for(grace_period) { reloaded_unicorn }
+          Thread.new do
+            sleep grace_period
+            terminate
+          end
           reloaded_unicorn
         else
           raise "unicorn didn't reload correctly within grace period (was pid #{pid})"
         end
       end
 
+      def reloaded_unicorn
+        reloaded = UnicornProcess.from_pidfile(pidfile)
+        if reloaded && pid != reloaded.pid
+          reloaded
+        end
+      end
+
       def launch_assassin(grace_period)
         if running? && !@assassin_launched
           @assassin_launched = true
-          puts "preparing to kill unicorn #{pid} in #{grace_period} seconds"
+          debug "preparing to kill unicorn #{pid} in #{grace_period} seconds"
           unless fork
+            $0 = "unicorn-wrangler (waiting to kill #{pid})"
             File.write(assassin_pidfile, Process.pid.to_s)
 
-            trap 'TERM' do
+            trap_signals :TERM do
+              debug "Trapped and killed assassin"
               exit
             end
 
@@ -67,7 +105,9 @@ module Unicorn
       def recall_assassin
         if File.exist?(assassin_pidfile)
           assassin_pid = File.read(assassin_pidfile).to_i
-          Process.kill 'TERM', assassin_pid
+          debug "Recalling assassin with pid #{assassin_pid}"
+          Process.kill 'KILL', assassin_pid
+          File.delete assassin_pidfile
         end
       rescue Errno::ESRCH
       end
@@ -78,29 +118,15 @@ module Unicorn
 
       def terminate
         if running?
-          signal 'TERM'
+          signal :TERM
         else
-          "Attempt to terminate #{pid} failed as process not running"
-        end
-      end
-
-      def verbose(message)
-        self.class.verbose(message)
-      end
-
-      def self.verbose(message)
-        Unicorn::Wrangler.verbose(message)
-      end
-
-      def self.wait_for(&block)
-        until block.call
-          sleep 0.1
+          warn "Attempt to terminate #{pid} failed as process not running"
         end
       end
 
       def self.start(pidfile, command)
         Process.spawn(command, pgroup: true)
-        wait_for { File.exist?(pidfile) }
+        wait_for(60) { File.exist?(pidfile) }
         new(pidfile)
       end
 
@@ -109,71 +135,61 @@ module Unicorn
       end
     end
 
-    def start
-      setup_signal_handlers
+    class Main
+      include Utils
+      extend Utils
 
-      if unicorn && unicorn.running?
-        self.unicorn = reload_unicorn
-      else
-        self.unicorn = UnicornProcess.start(pidfile, command)
-        sleep grace_period
-      end
+      attr_reader :command, :pidfile, :grace_period
+      attr_accessor :unicorn
 
-      if unicorn.running?
-        verbose "Unicorn running on #{unicorn.pid}"
-        loop_while_unicorn_runs
-      else
-        verbose "Unable to start unicorn.  Exiting."
+      def initialize(command, options = {})
+        @command = command
+        @pidfile = File.expand_path(options[:pidfile] || 'unicorn.pid')
+        @grace_period = options[:grace_period] || 60
+        Wrangler.logger.level = Logger::DEBUG if options[:verbose]
+        @unicorn = UnicornProcess.from_pidfile(@pidfile)
       end
-    end
 
-    def setup_signal_handlers
-      trap_signals(:HUP) { reload_unicorn }
-      trap_signals(:QUIT, :INT, :TERM) do |signal|
-        kill_unicorn_after_delay
-        exit
-      end
-    end
+      def start
+        $0 = 'unicorn-wrangler (starting up)'
+        setup_signal_handlers
 
-    def reload_unicorn
-      self.unicorn = unicorn.reload(grace_period) if unicorn
-    end
+        if unicorn && unicorn.running?
+          self.unicorn = unicorn.reload(grace_period)
+        else
+          self.unicorn = UnicornProcess.start(pidfile, command)
+          wait_for(grace_period) { unicorn.running? }
+        end
 
-    def loop_while_unicorn_runs
-      loop do
         if unicorn.running?
-          sleep 0.1
+          debug "Unicorn running on #{unicorn.pid}"
+          $0 = "unicorn-wrangler (monitoring #{unicorn.pid})"
+          loop_while_unicorn_runs
         else
-          exit
+          debug "Unable to start unicorn.  Exiting."
         end
       end
-    end
 
-    def trap_signals(*signals, &block)
-      signals.map(&:to_s).each do |signal|
-        trap(signal) do
-          verbose "received #{signal} (managing #{unicorn.pid})"
-          block.call signal
+      def setup_signal_handlers
+        trap_signals(:HUP)  do
+          self.unicorn = unicorn.reload(grace_period) if unicorn
         end
-      end
-    end
 
-    def wait_for(&block)
-      until block.call
-        sleep 0.1
+        trap_signals(:QUIT, :INT, :TERM) do |signal|
+          unicorn.launch_assassin(grace_period) if unicorn
+          exit
+        end
       end
-    end
-
-    def kill_unicorn_after_delay
-      unicorn.launch_assassin(grace_period) if unicorn
-    end
-
-    def verbose(message)
-      self.class.verbose(message)
-    end
 
-    def self.verbose(message)
-      puts message if @verbose
+      def loop_while_unicorn_runs
+        loop do
+          if unicorn.running?
+            sleep 0.1
+          else
+            exit
+          end
+        end
+      end
     end
   end
 end

data/lib/unicorn/wrangler/version.rb

@@ -1,5 +1,5 @@
 module Unicorn
   class Wrangler
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-wrangler
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler