server-starter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d6ac01d0b1513979bb1b7d44518ad974250ac2e
-  data.tar.gz: 5b5cf5cc27f280472e5c3008127141b665cb56b9
+  metadata.gz: 2f0ef5edbfbb9ba17014f1db7a34876b5b06b687
+  data.tar.gz: 0e38e80a7d760ea3c774f7c677a7f259bf9c7133
 SHA512:
-  metadata.gz: 2afe47513bde1c810d8c9d573cfb1f72c7a7cbbb62374afa4c378a73808d763161be574a5618e83a7d9628557608ffa3bb8e3bc49eb918725ca7af95d8b0520f
-  data.tar.gz: 7d384eb0e55be2d485f0739b323297ee69e610392769197750019ecf56300662458b17d450b445bfbe65a22353e494f2983b51190a9906ab3fd75f1a1464b4b6
+  metadata.gz: d91568f35236855ce8d0a7a77cefb05ca73543d60af9d241886233a49e1479a13665aea0c7219bfb79ee078f2e207562ce755aad4fffa7eb0a0f8de2cbfcfafc
+  data.tar.gz: 2c8f16573b6cab8c5cc834881b7001c566d47236572b3a0c5c0de731d5d0390a927a62833ddb3ffc33b6d416f5fc2cf0145363f07ebcbfc49d4691adc2e16319

data/CHANGELOG.md

@@ -1,4 +1,11 @@
+## 0.1.1 (2015/03/16)
+
+Enhancements:
+
+* Add Server::Starter::UnicornListener
+
 ## 0.1.0 (2015/03/16)
 
 First version
 
+

data/README.md

@@ -32,20 +32,18 @@ bundle exec start_server.rb --status-file=/path/to/app/log/unicorn.stat \
 An example of unicorn.conf:
 
 ```ruby
-worker_processes  4
+require 'server/starter/unicorn_listener'
+listener = Server::Starter::UnicornListener
+
+worker_processes  2
 preload_app true
  
 APP_ROOT = File.expand_path('../..', __FILE__)
 status_file = File.join(APP_ROOT, 'log/unicorn.stat')
- 
-if ENV.key?('SERVER_STARTER_PORT')
-  fds = ENV['SERVER_STARTER_PORT'].split(';').map { |x|
-    path_or_port, fd = x.split('=', 2)
-    fd
-  }
-  ENV['UNICORN_FD'] = fds.join(',')
-  ENV.delete('SERVER_STARTER_PORT')
-else
+
+fd = listener.listen
+unless fd
+  # Fallback if not running under Server::Starter
   listen ENV['PORT'] || '10080'
 end
  
@@ -61,22 +59,15 @@ end
  
 after_fork do |server, worker|
   defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
- 
-  begin
-    # This allows a new master process to incrementally
-    # phase out the old master process with SIGTTOU to avoid a
-    # thundering herd (especially in the "preload_app false" case)
-    # when doing a transparent upgrade.  The last worker spawned
-    # will then kill off the old master process with a SIGQUIT.
-    pids = File.readlines(status_file).map {|_| _.chomp.split(':') }.to_h
-    old_gen = ENV['SERVER_STARTER_GENERATION'].to_i - 1
-    if old_pid = pids[old_gen.to_s]
-      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill(sig, old_pid.to_i)
-    end
-  rescue Errno::ENOENT, Errno::ESRCH => e
-    $stderr.puts "#{e.class} #{e.message}"
-  end
+
+  # This is optional
+  #
+  # This allows a new master process to incrementally
+  # phase out the old master process with SIGTTOU to avoid a
+  # thundering herd (especially in the "preload_app false" case)
+  # when doing a transparent upgrade.  The last worker spawned
+  # will then kill off the old master process with a SIGQUIT.
+  listener.slow_start(server, worker, status_file)
 end
 ```
 

data/example/config/unicorn.conf

@@ -1,17 +1,15 @@
+require 'server/starter/unicorn_listener'
+listener = Server::Starter::UnicornListener
+
 worker_processes  2
 preload_app true
  
 APP_ROOT = File.expand_path('../..', __FILE__)
 status_file = File.join(APP_ROOT, 'log/unicorn.stat')
- 
-if ENV.key?('SERVER_STARTER_PORT')
-  fds = ENV['SERVER_STARTER_PORT'].split(';').map { |x|
-    path_or_port, fd = x.split('=', 2)
-    fd
-  }
-  ENV['UNICORN_FD'] = fds.join(',')
-  ENV.delete('SERVER_STARTER_PORT')
-else
+
+fd = listener.listen
+unless fd
+  # Fallback if not running under Server::Starter
   listen ENV['PORT'] || '10080'
 end
  
@@ -27,20 +25,13 @@ end
  
 after_fork do |server, worker|
   defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
- 
-  begin
-    # This allows a new master process to incrementally
-    # phase out the old master process with SIGTTOU to avoid a
-    # thundering herd (especially in the "preload_app false" case)
-    # when doing a transparent upgrade.  The last worker spawned
-    # will then kill off the old master process with a SIGQUIT.
-    pids = File.readlines(status_file).map {|_| _.chomp.split(':') }.to_h
-    old_gen = ENV['SERVER_STARTER_GENERATION'].to_i - 1
-    if old_pid = pids[old_gen.to_s]
-      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill(sig, old_pid.to_i)
-    end
-  rescue Errno::ENOENT, Errno::ESRCH => e
-    $stderr.puts "#{e.class} #{e.message}"
-  end
+
+  # This is optional
+  #
+  # This allows a new master process to incrementally
+  # phase out the old master process with SIGTTOU to avoid a
+  # thundering herd (especially in the "preload_app false" case)
+  # when doing a transparent upgrade.  The last worker spawned
+  # will then kill off the old master process with a SIGQUIT.
+  listener.slow_start(server, worker, status_file)
 end

data/lib/server/starter/unicorn_listener.rb

@@ -0,0 +1,33 @@
+class Server::Starter
+  class UnicornListener
+    # Map ENV['SERVER_STARTER_PORT'] to ENV['UNICORN_FD']
+    def self.listen
+      return nil unless ENV.key?('SERVER_STARTER_PORT')
+      fds = ENV['SERVER_STARTER_PORT'].split(';').map { |x|
+        path_or_port, fd = x.split('=', 2)
+        fd
+      }
+      ENV['UNICORN_FD'] = fds.join(',')
+    end
+
+    # This allows a new master process to incrementally
+    # phase out the old master process with SIGTTOU to avoid a
+    # thundering herd (especially in the "preload_app false" case)
+    # when doing a transparent upgrade.  The last worker spawned
+    # will then kill off the old master process with a SIGQUIT.
+    #
+    # @param server [Unicorn::HttpServer]
+    # @param worker [Unicorn::Worker]
+    # @param status_file [String] path to Server::Starter status file (--status-file)
+    def self.slow_start(server, worker, status_file)
+      pids = File.readlines(status_file).map {|_| _.chomp.split(':') }.to_h
+      old_gen = ENV['SERVER_STARTER_GENERATION'].to_i - 1
+      if old_pid = pids[old_gen.to_s]
+        sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+        Process.kill(sig, old_pid.to_i)
+      end
+    rescue Errno::ENOENT, Errno::ESRCH => e
+      $stderr.puts "#{e.class} #{e.message}"
+    end
+  end
+end

data/lib/server/starter/version.rb

@@ -1,5 +1,5 @@
 class Server
   class Starter
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server-starter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -48,6 +48,7 @@ files:
 - example/start_server
 - lib/server/starter.rb
 - lib/server/starter/helper.rb
+- lib/server/starter/unicorn_listener.rb
 - lib/server/starter/version.rb
 - server-starter.gemspec
 homepage: https://github.com/sonots/ruby-server-starter