cuba-bin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1626abc9ea3d27fadf54ac21bb2b94043bd9d18
-  data.tar.gz: d68bc5330a8670fcaa788117eee8d4e85fa13909
+  metadata.gz: 40ca208dff5233dbc4567d43f43603c788c9d1e0
+  data.tar.gz: 46ed27b965f1eb00bf4a1b4daa9d69f6afd3a698
 SHA512:
-  metadata.gz: 634b934289fcc14feba6b8045530298dab0b16cc0d91687e3cdb2b5e1672a803dd1190a00b35568bdd34868c805962941e34da163006bf6cc9445ad09974fa6e
-  data.tar.gz: c7c2f14d49e3f5e3abc38e63676826cbef5f6a80404e53fb6471c2898f2229b419a5180cf121cc36b472f5e0f29f1230eca8aa5de97b08b3146e6f4d5b2105e9
+  metadata.gz: ba703159dc22a19284daf85a313bf36aa007267614694d5c62e648dad48c19bb9c45e3be7cc97ac984c28fcc8e66be4280a2b9c44a68b2a3a50aa9f06771b885
+  data.tar.gz: 97928c130416dc6a056496f739c4843cae5efd899caada5e97a930c82995afdcd5ff5450c5c28c552f24293fc44e10788b91d5d56068f36d3687bafbe975e9e2

data/cuba-bin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cuba"
   spec.add_dependency "clap"
-  spec.add_dependency "puma"
+  spec.add_dependency "unicorn"
   spec.add_dependency "listen"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/cuba/bin.rb

@@ -3,7 +3,7 @@ require "cuba/bin/daemon"
 
 module Cuba::Bin
   unless defined? VERSION
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 
   extend self

data/lib/cuba/bin/daemon.rb

@@ -18,14 +18,12 @@ module Cuba::Bin
     # todo> make configurable
     IGNORE_PATTERNS             = [/\.direnv/, /\.sass-cache/, /^tmp/]
 
-    attr_accessor :options, :puma_args
-    attr_accessor :puma_pid
+    attr_accessor :options, :unicorn_args
+    attr_accessor :unicorn_pid
 
-    def initialize(puma_args)
-      puma_args.concat ['-w', '1'] unless puma_args.include? '-w'
-
-      @puma_args = puma_args
-      # @options, @puma_args = options, puma_args
+    def initialize(unicorn_args)
+      @unicorn_args = unicorn_args
+      # @options, @unicorn_args = options, unicorn_args
       @options = {}
       options[:pattern]       ||= DEFAULT_RELOAD_PATTERN
       options[:full]          ||= DEFAULT_FULL_RELOAD_PATTERN
@@ -33,12 +31,11 @@ module Cuba::Bin
       self
     end
 
-
     def log(msg)
       $stderr.puts msg
     end
 
-    def start_puma
+    def start_unicorn
       ENV['RACK_ENV'] ||= 'development'
 
       envs     = {}
@@ -58,26 +55,31 @@ module Cuba::Bin
         end
       end
 
-      @puma_pid = Kernel.spawn(envs, 'puma', *puma_args)
+      @unicorn_pid = Kernel.spawn(envs, 'unicorn', '-c', unicorn_config, *unicorn_args)
+    end
+
+    def unicorn_config
+      File.expand_path 'unicorn.conf.rb', File.dirname(__FILE__)
     end
 
-    # TODO maybe consider doing like: http://puma.bogomips.org/SIGNALS.html
+    # TODO maybe consider doing like: http://unicorn.bogomips.org/SIGNALS.html
     def reload_everything
-      Process.kill(:QUIT, puma_pid)
-      Process.wait(puma_pid)
-      start_puma
+      Process.kill(:QUIT, unicorn_pid)
+      Process.wait(unicorn_pid)
+      start_unicorn
     end
 
     def shutdown
       listener.stop
-      Process.kill(:TERM, puma_pid)
-      Process.wait(puma_pid)
+      Process.kill(:TERM, unicorn_pid)
+      Process.wait(unicorn_pid)
       exit
     end
 
-    # tell puma to gracefully shut down workers
-    def graceful_restart
-      Process.kill(:SIGUSR1, puma_pid)
+    # tell unicorn to gracefully shut down workers
+    def hup_unicorn
+      log "hupping #{unicorn_pid}"
+      Process.kill(:HUP, unicorn_pid)
     end
 
     def handle_change(modified, added, removed)
@@ -86,7 +88,7 @@ module Cuba::Bin
       if (modified + added + removed).index {|f| f =~ options[:full]}
         reload_everything
       else
-        graceful_restart
+        hup_unicorn
       end
     end
 
@@ -107,7 +109,7 @@ module Cuba::Bin
       Signal.trap("INT") { |signo| that.shutdown }
       Signal.trap("EXIT") { |signo| that.shutdown }
       listener.start
-      start_puma
+      start_unicorn
 
       # And now we just want to keep the thread alive--we're just waiting around to get interrupted at this point.
       sleep(99999) while true

data/lib/cuba/bin/unicorn.conf.rb

@@ -0,0 +1,64 @@
+worker_processes Integer(ENV["CUBA_BIN_WORKERS"] || 2)
+timeout          Integer(ENV['CUBA_BIN_TIMEOUT'] || 30)
+listen           Integer(ENV['CUBA_BIN_PORT']    || 8080)
+
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+preload_app true
+GC.respond_to?(:copy_on_write_friendly=) and
+  GC.copy_on_write_friendly = true
+
+# Enable this flag to have unicorn test client connections by writing the
+# beginning of the HTTP headers before calling the application.  This
+# prevents calling the application for connections that have disconnected
+# while queued.  This is only guaranteed to detect clients on the same
+# host unicorn runs on, and unlikely to detect disconnects even on a
+# fast LAN.
+check_client_connection false
+
+before_fork do |server, worker|
+  # the following is highly recomended for Rails + "preload_app true"
+  # as there's no need for the master process to hold a connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # 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.
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if old_pid != server.pid
+    begin
+      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+      Process.kill(sig, File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+    end
+  end
+  #
+  # Throttle the master from forking too quickly by sleeping.  Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
+  # sleep 1
+end
+
+after_fork do |server, worker|
+  # per-process listener ports for debugging/admin/migrations
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+  # the following is *required* for Rails + "preload_app true",
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+
+  # if preload_app is true, then you may also want to check and
+  # restart any other shared sockets/descriptors such as Memcached,
+  # and Redis.  TokyoCabinet file handles are safe to reuse
+  # between any number of forked children (assuming your kernel
+  # correctly implements pread()/pwrite() system calls)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - cj
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,6 +111,7 @@ files:
 - cuba-bin.gemspec
 - lib/cuba/bin.rb
 - lib/cuba/bin/daemon.rb
+- lib/cuba/bin/unicorn.conf.rb
 homepage: ''
 licenses:
 - MIT