unicorn-wrangler 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07223bd2cd439dbd81d9e6c7682dbef99d13af05
-  data.tar.gz: c75917973a88533513a353c7f548095c02071f1d
+  metadata.gz: d6c6c6c34675d90e10f42b3edd377a4c7201df27
+  data.tar.gz: 043e1bbcdaf37e1eb17772969a2d8a5c394d20c9
 SHA512:
-  metadata.gz: 66ae9fced46e50425249002ed43216eded8ccc76c40174b20e70ccfe70b3c7f10d0fac5d470f8d653314d1ae11550695a73f10b6c14222d9bbe60f26cc6fc301
-  data.tar.gz: 8ac25f925bcb4b6c01a3f6ac4827e693c1df510972f2ecc20910098f31e18e88e801589a5b5b454316a307c2ab68d3cd7cdf0e21d5d551c888ee58592e47934e
+  metadata.gz: 717e78358e2ba9d8d6a75f1848423a6ee7265712f900a1c7a05edc3baf88de9c24835200378f672cfab8ec7ddccbcb4eaeee430f39de852b726805e17fcb60fd
+  data.tar.gz: 8c8358d531f80106ddba1461b044c8f91ffade248f79bfc459989a21803583593cbe6a85f259163ab9668278149f19e9cb0e57707f1d8165def51bbeafc13c15

data/bin/unicorn-wrangler

@@ -16,6 +16,10 @@ OptionParser.new do |opts|
   opts.on("-g", "--grace-period PERIOD", "Time to wait before shutting down server") do |time|
     options[:grace_period] = time.to_i
   end
+
+  opts.on("-v", "--verbose", "Verbose output") do
+    options[:verbose] = true
+  end
 end.parse!(ARGV[0...command_index])
 
 launcher = Unicorn::Wrangler.new command, options

data/lib/unicorn/wrangler.rb

@@ -3,11 +3,13 @@ require "unicorn/wrangler/version"
 module Unicorn
   class Wrangler
     attr_reader :command, :pidfile, :grace_period
+    attr_accessor :unicorn_pid
 
     def initialize(command, options = {})
       @command = command
       @pidfile = File.expand_path(options[:pidfile] || 'unicorn.pid')
       @grace_period = options[:grace_period] || 60
+      @verbose = options[:verbose]
     end
 
     def start
@@ -17,15 +19,27 @@ module Unicorn
         exit
       end
 
-      if unicorn_running?
+      if old_unicorn = old_pidfile_contents && process_running?(old_unicorn)
+        signal :QUIT, old_unicorn
+      end
+
+      self.unicorn_pid = pidfile_contents
+
+      if unicorn_pid && process_running?(unicorn_pid)
+        debug "running unicorn found at #{unicorn_pid}"
         restart_unicorn
       else
-        Process.spawn(command, pgroup: true)
-        wait_for { unicorn_running? }
+        debug "no running unicorn found, starting new instance"
+        self.unicorn_pid = Process.spawn(command, pgroup: true)
+        wait_for { process_running?(unicorn_pid) }
+        debug "new instance started with PID #{unicorn_pid}"
       end
 
       loop do
-        exit unless unicorn_running?
+        unless process_running?(unicorn_pid)
+          debug "unicorn(#{unicorn_pid}) no longer running, quitting."
+          exit
+        end
         sleep 1
       end
     end
@@ -35,26 +49,38 @@ module Unicorn
     def trap_signals(*signals, &block)
       signals.map(&:to_s).each do |signal|
         trap(signal) do
-          puts "unicorn-wrangler #{Process.pid} received #{signal} (managing #{unicorn_pid})"
+          debug "received #{signal} (managing #{unicorn_pid})"
           block.call signal
         end
       end
     end
 
     def restart_unicorn
-      original_pid = unicorn_pid
-      Process.kill "USR2", unicorn_pid
-      wait_for { unicorn_pid != original_pid }
+      debug "restarting unicorn process at #{unicorn_pid}"
+      signal "USR2", unicorn_pid
+      wait_for { pidfile_contents && unicorn_pid != pidfile_contents }
+      debug "new master process started at #{pidfile_contents}"
       sleep grace_period
-      Process.kill "TERM", original_pid
+      signal "TERM", unicorn_pid
+      self.unicorn_pid = pidfile_contents
     end
 
-    def unicorn_pid
+    def pidfile_contents
       File.exist?(pidfile) && File.read(pidfile).to_i
     end
 
-    def unicorn_running?
-      unicorn_pid && Process.getpgid(unicorn_pid)
+    def old_pidfile_contents
+      File.exist?(pidfile + ".oldbin") && File.read(pidfile + ".oldbin").to_i
+    end
+
+    def signal(name, pid)
+      debug "signalling #{pid} with #{name}"
+      Process.kill name, pid
+    rescue Errno::ESRCH
+    end
+
+    def process_running?(pid)
+      pid && Process.getpgid(pid)
     rescue Errno::ESRCH
       false
     end
@@ -66,14 +92,18 @@ module Unicorn
     end
 
     def kill_unicorn_after_delay
-      if unicorn_running?
-        puts "Preparing to kill unicorn in #{grace_period} seconds"
+      if process_running?(unicorn_pid)
         unless fork
+          debug "preparing to kill unicorn #{unicorn_pid} in #{grace_period} seconds"
           Process.setsid
           sleep grace_period
-          Process.kill :TERM, unicorn_pid if unicorn_running?
+          signal :TERM, unicorn_pid if process_running?(unicorn_pid)
         end
       end
     end
+
+    def debug(message)
+      puts message if @verbose
+    end
   end
 end

data/lib/unicorn/wrangler/version.rb

@@ -1,5 +1,5 @@
 module Unicorn
   class Wrangler
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-wrangler
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Ward