capistrano-unicorn-edge 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc96d50be88089308947a7034468db16be65b37
-  data.tar.gz: cd519fc2a7f8e6e773e5b0b69ca08ade9855e793
+  metadata.gz: b50eaf0a41c3a3f1ec77b0eab2a72cee477b85ac
+  data.tar.gz: 1060be56f977c9f5e068a355fc10119300e37fed
 SHA512:
-  metadata.gz: 389ae4a775edde94e6db97e60fd96d053e36806a97038871a9431a60d8bb7c348b140947edaaa5bf395f87ccba1538da63cc275410b6db97a083791d51339a9c
-  data.tar.gz: 3b30e56046b20eae72eddaa8bcd2b2227d7fbb7424e8de260bcc12837e05c1ceab1bdf0f2049df071a07c2a68538703aa006ce32266b7c91b1ad398f99d5a6ee
+  metadata.gz: 3c8f6d1fc296293373bb9858eda9162283504ecf5a9b83f503560df016f52f46a4bde0492dcf74cb28169c1376054e18e8c42bf0273cb2e5bddfa210bcd48dc9
+  data.tar.gz: 7cc64f66c0e4f16587fb434ad33acfbb3edc8bc105f78f0e48f70b0f70c2f212aefcd91a079365393b156f0a0c08142f5cf87158c4b1846e25e22273dbd2baa7

data/README.md

@@ -7,11 +7,11 @@ cap unicorn:start                  # Start unicorn
 cap unicorn:stop                   # Stop unicorn gracefully (QUIT)
 cap unicorn:shutdown               # Stop unicorn immediately (TERM)
 cap unicorn:restart                # Restart unicorn
+cat unicorn:restart_quit           # Restart unicorn, simple stop it gracefully and start again (QUIT)
+cat unicorn:restart_term           # Restart unicorn, simple stop it immediately and start it again (TERM)
 cap unicorn:restart_hup            # Restart unicorn, when preload_app is false (HUP)
 cap unicorn:restart_usr2           # Restart unicorn, when before_fork hook is set and preload_app is true (USR2)
 cap unicorn:restart_usr2_quit      # Restart unicorn, when before_fork hook is not set and preload_app is true (USR2 + QUIT)
-cat unicorn:restart_quit           # Restart unicorn, simple stop it gracefully and start again (QUIT)
-cat unicorn:restart_term           # Restart unicorn, simple stop it immediately and start it again (TERM)
 cap unicorn:add_worker[count]      # Add a worker (TTIN)
 cap unicorn:remove_worker[count]   # Remove a worker (TTOU)
 cap unicorn:stop_workers           # Stop all workers but keep the master running (WINCH)
@@ -51,19 +51,17 @@ set :unicorn_roles, :app # this is default
 set :unicorn_options, '' # this is default
 set :unicorn_restart_delay, 5 # this is default
 set :unicorn_rack_env, :deployment # this is default
-set :unicorn_restart_method, :restart_usr2 # this is default
+set :unicorn_restart_method, :restart_quit # this is default
 ```
 
-Everything should work **out of the box** but you need to **set up unicorn's config**. (see an example `examples/unicorn.rb`).
-
-There are three different ways to restart server:
-* `:restart_hup` restarts all workers and therefore all code changes, makes sense if `preload_app` is false
-* `:restart_usr2_quit` re-executes the running binary and stops previous instance in `:unicorn_restart_delay`
-* `:restart_usr2` the same as above but `before_fork` hook has to be set, default and the best choice
+There are five different ways to restart server:
 * `:restart_quit` stops server gracefully and starts it again in `:unicorn_restart_delay`
 * `:restart_term` stops server immediately and starts it again
+* `:restart_hup` restarts all workers and therefore all code changes, makes sense if `preload_app` is false
+* `:restart_usr2` the same as above but `before_fork` hook has to be set, see an example `examples/unicorn.rb`
+* `:restart_usr2_quit` re-executes the running binary and stops previous instance in `:unicorn_restart_delay`
 
-Using methods which are based on `QUIT` signal can't be absolutely reliable
+`USR2` signal based methods give you zero-downtime deployments but I've run into one trouble when environment changes (e.g. in `/etc/environment`) aren't updated because new instance is spawned by the old one, unfortunately it can be solved only by re-logining and starting a new instance (`restart_quit` does the stuff).
 
 ## Contributing
 

data/capistrano-unicorn-edge.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-unicorn-edge"
-  spec.version       = "0.1.5"
+  spec.version       = "0.1.6"
   spec.authors       = ["Alexander Menzhinsky"]
   spec.email         = ["amenzhinsky@gmail.com"]
   spec.summary       = %q{Unicorn support for Capistrano 3.x}

data/examples/unicorn.rb

@@ -24,6 +24,12 @@ stdout_path "#{app_path}/log/unicorn.log"
 pid "#{app_path}/tmp/pids/unicorn.pid"
 
 before_fork do |server, worker|
+  # Using Capistrano, the path to the Gemfile is stored with release
+  # timestamp in the path, rather than the current symlink.
+  unless ENV['BUNDLE_GEMFILE']
+    ENV['BUNDLE_GEMFILE'] = "#{app_path}/Gemfile"
+  end
+
   ##
   # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
   # immediately start loading up a new version of itself (loaded with a new

data/lib/capistrano/tasks/unicorn.cap

@@ -25,6 +25,23 @@ namespace :unicorn do
     invoke "unicorn:#{fetch(:unicorn_restart_method)}"
   end
 
+  desc 'Restart unicorn, simple stop it gracefully and start again (QUIT)'
+  task :restart_quit do
+    on roles(fetch(:unicorn_roles)) do
+      unicorn_send_signal(:QUIT) if unicorn_is_running?
+      execute :sleep, fetch(:unicorn_restart_delay)
+      unicorn_start
+    end
+  end
+
+  desc 'Restart unicorn, simple stop it immediately and start it again (TERM)'
+  task :restart_term do
+    on roles(fetch(:unicorn_roles)) do
+      unicorn_send_signal(:TERM) if unicorn_is_running?
+      unicorn_start
+    end
+  end
+
   desc 'Restart unicorn, when preload_app is false (HUP)'
   task :restart_hup do
     on roles(fetch(:unicorn_roles)) do
@@ -64,23 +81,6 @@ namespace :unicorn do
     end
   end
 
-  desc 'Restart unicorn, simple stop it gracefully and start again (QUIT)'
-  task :restart_quit do
-    on roles(fetch(:unicorn_roles)) do
-      unicorn_send_signal(:QUIT) if unicorn_is_running?
-      execute :sleep, fetch(:unicorn_restart_delay)
-      unicorn_start
-    end
-  end
-
-  desc 'Restart unicorn, simple stop it immediately and start it again (TERM)'
-  task :restart_term do
-    on roles(fetch(:unicorn_roles)) do
-      unicorn_send_signal(:TERM) if unicorn_is_running?
-      unicorn_start
-    end
-  end
-
   desc 'Add a worker (TTIN)'
   task :add_worker, :count do |_, args|
     on roles(fetch(:unicorn_roles)) do
@@ -134,7 +134,7 @@ namespace :load do
     set :unicorn_options, ''
     set :unicorn_restart_delay, 5
     set :unicorn_rack_env, :deployment
-    set :unicorn_restart_method, :restart_usr2
+    set :unicorn_restart_method, :restart_quit
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-edge
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alexander Menzhinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano