capistrano-unicorn-edge 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea77bba82cc4703c42b81691b9da9cde60ef05c3
-  data.tar.gz: dfe67836b374e0b635bec316a494363d4c8593b4
+  metadata.gz: 4dc96d50be88089308947a7034468db16be65b37
+  data.tar.gz: cd519fc2a7f8e6e773e5b0b69ca08ade9855e793
 SHA512:
-  metadata.gz: 87461ffd0a9804cc42da3c3b7b8272ab280612ab6643489f64f34b7d9ce98882823ae7641488e015f8b243283df2c5920b19a288431c55f7a34855774d2da5ee
-  data.tar.gz: 3f132926442f85b297fd8df88fb4a172541350952305bd1729c576396a3b1203f9f94aa8259636d6c3e9b7dff1cb50c37a787bfa56076d4c892c918cb95267e2
+  metadata.gz: 389ae4a775edde94e6db97e60fd96d053e36806a97038871a9431a60d8bb7c348b140947edaaa5bf395f87ccba1538da63cc275410b6db97a083791d51339a9c
+  data.tar.gz: 3b30e56046b20eae72eddaa8bcd2b2227d7fbb7424e8de260bcc12837e05c1ceab1bdf0f2049df071a07c2a68538703aa006ce32266b7c91b1ad398f99d5a6ee

data/README.md

@@ -6,10 +6,12 @@ Unicorn specific tasks for Capistrano 3.x
 cap unicorn:start                  # Start unicorn
 cap unicorn:stop                   # Stop unicorn gracefully (QUIT)
 cap unicorn:shutdown               # Stop unicorn immediately (TERM)
-cap unicorn:restart                # Restart unicorn, invokes unicorn:restart_usr2
+cap unicorn:restart                # Restart unicorn
 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)
@@ -52,12 +54,16 @@ set :unicorn_rack_env, :deployment # this is default
 set :unicorn_restart_method, :restart_usr2 # this is default
 ```
 
-Everything should work **out-of-box** but you need to **set up unicorn's config**. (see an example `examples/unicorn.rb`).
+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` reloads config file and gracefully restart all workers, if `preload_app` is true, then application code changes will have no effect
-  * `:restart_usr2_quit` re-execute the running binary and kill old instance in a time interval specified in `:unicorn_restart_delay`, but this method can't be absolutely reliable
-  * `:restart_usr2` the same as above but `before_fork` hook which kills old instance has to be set, default and the best choice
+* `: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
+* `:restart_quit` stops server gracefully and starts it again in `:unicorn_restart_delay`
+* `:restart_term` stops server immediately and starts it again
+
+Using methods which are based on `QUIT` signal can't be absolutely reliable
 
 ## Contributing
 

data/{capistrano-unicorn.gemspec → capistrano-unicorn-edge.gemspec}

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-unicorn-edge"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["Alexander Menzhinsky"]
   spec.email         = ["amenzhinsky@gmail.com"]
   spec.summary       = %q{Unicorn support for Capistrano 3.x}
-  spec.description   = %q{Unicorn support for Capistrano 3.x}
+  spec.description   = %q{Unicorn support for Capistrano 3.x, some text to remove warnings}
   spec.homepage      = "https://github.com/amenzhinsky/capistrano-unicorn-edge"
   spec.license       = "MIT"
 
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano', '~> 3.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", '~> 1.0'
 end

data/lib/capistrano/tasks/unicorn.cap

@@ -36,7 +36,7 @@ namespace :unicorn do
     end
   end
 
-  desc 'Restart unicorn, when before_fork hook is set and preload_app is true (USR2)'
+  desc 'Restart unicorn, when before_fork hook is set (USR2)'
   task :restart_usr2 do
     on roles(fetch(:unicorn_roles)) do
       if unicorn_is_running?
@@ -47,7 +47,7 @@ namespace :unicorn do
     end
   end
 
-  desc 'Restart unicorn, when before_fork hook is not set and preload_app is true (USR2 + QUIT)'
+  desc 'Restart unicorn, when before_fork hook is not set (USR2 + QUIT)'
   task :restart_usr2_quit do
     on roles(fetch(:unicorn_roles)) do
       if unicorn_is_running?
@@ -64,6 +64,23 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-edge
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alexander Menzhinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -42,17 +42,17 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Unicorn support for Capistrano 3.x
+        version: '1.0'
+description: Unicorn support for Capistrano 3.x, some text to remove warnings
 email:
 - amenzhinsky@gmail.com
 executables: []
@@ -64,7 +64,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- capistrano-unicorn.gemspec
+- capistrano-unicorn-edge.gemspec
 - examples/unicorn.rb
 - lib/capistrano/tasks/unicorn.cap
 - lib/capistrano/unicorn.rb