capistrano3-unicorn 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f84ba3c17bf1822dc5df22d3e72df5d5b82abbdc
-  data.tar.gz: 33cb944e9facfb6596d3047a83ec2cd08754fb19
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmNiYWFhN2NkM2ZhZTI0MzMyNGFkM2RmMzQxODc4MjNmM2Y5N2VhYQ==
+  data.tar.gz: !binary |-
+    YTMyMWNjM2I2YjIxN2Q2ODRmYzg4ZTZkOTk1NzZiNjg5NjUwNjUyYQ==
 SHA512:
-  metadata.gz: 1c59388ca7b771f37a9b6a4d7c296f0d17de5474007258709b9652f69c3e4c9b9d8e09702570c20eb28af5910a64319490cda821e90292762fade656644db551
-  data.tar.gz: 8ba5dc92bdc7eeb4253c6564098335ab431e85821799aff734ec73682a7322a6b9ff6b9fea14b0287bdee9a7640345379b58ace51d638f01642f97d2cf32f2dc
+  metadata.gz: !binary |-
+    NzkzYzI2ODJkYTMyYTcxYjg5ZTE5ODRlNDQ5MzZiMmQzYzRjMDFjNGE5MGMy
+    ZmQ3ZDlkNmM3NGRkYThhZmM5MzU0NjcxYTViNWUyZWNlMTA2YTJjZTU3ODQ3
+    NzA1OTc2YTFiZjVhNDdmMjk2ZWQ2NmU3ODE0YjhkMDk5YWYzMzk=
+  data.tar.gz: !binary |-
+    MmQ5OTRhOTBjMjViMjNiZGI4NjJiNzIzODgxMzZiOWRkMzdkZTA5Y2NmNDZi
+    ZWZmMDQxZWM1ZjU2Y2NhNTUzODc3MWI2MWE1ODMxMjBjYjRkZjZkMTBkYzhj
+    Yzg4YzViMWY2ZWI2MGE1ZDhlNzZiMThkMmFiNWMwNzVmNTk3Nzk=

data/.gitignore

@@ -0,0 +1,4 @@
+Gemfile.lock
+.ruby-version
+.ruby-gemset
+pkg/

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Capistrano3 Unicorn Changelog
 
+## `0.2.1`
+
+- Revert `:unicorn_config_path` falling back to `config/unicorn/unicorn.rb` due to flawed implementation
+
+## `0.2.0`
+
+- `unicorn:restart` no longer sends QUIT to oldbin since most people use a callback in `unicorn.rb`
+- `unicorn:legacy_restart` preserves the QUIT to oldbin
+- `:unicorn_config_path` adds `config/unicorn/unicorn.rb` as a default path
+- added example unicorn.rb
+- removed `:unicorn_bundle_gemfile`, this should have been in a before_exec in the unicorn configuration
+
+Thanks to @spectator, @lxxdn, @ahorner, and @soulcutter
+
 ## `0.1.1`
 
 - Removed default value for `:unicorn_bundle_gemfile` of `:bundle_gemfile` so that current_path is the default

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/README.md

@@ -12,21 +12,17 @@ This is a capistrano v3 plugin that integrates Unicorn tasks into capistrano dep
 
 ### Conventions
 
-You can override the defaults by `set :unicorn_example, value` in the `config/deploy.rb` or `config/deploy/ENVIRONMENT.rb` capistrano deployment files
+You can override the defaults by `set :unicorn_example, value` in the `config/deploy.rb` or `config/deploy/ENVIRONMENT.rb` capistrano deployment files.
 
-- `:unicorn_pid`
+Example Unicorn config [examples/unicorn.rb](https://github.com/tablexi/capistrano3-unicorn/blob/master/examples/unicorn.rb)
 
-    Assumes your pid file will be located in `tmp/pids/unicorn.pid` which is symlinked by `:linked_dirs` to survive across deployments
+- `:unicorn_pid`
 
-    *NOTE: THIS PATH WAS CHANGED AS OF v0.1.0*
+    Default assumes your pid file will be located in `CURRENT_PATH/tmp/pids/unicorn.pid`. The unicorn_pid should be defined with an absolute path.
 
 - `:unicorn_config_path`
 
-    Assumes that your Unicorn configuration will be located in `config/unicorn/RAILS_ENV.rb`
-
-- `:unicorn_restart_sleep_time`
-
-    When performing zero-downtime deployment via the `unicorn:restart` task, send the USR2 signal, sleep for this many seconds (defaults to 3), then send the QUIT signal
+    Default assumes that your Unicorn configuration will be located in `CURRENT_PATH/config/unicorn/RAILS_ENV.rb`
 
 - `:unicorn_roles`
 
@@ -42,7 +38,13 @@ You can override the defaults by `set :unicorn_example, value` in the `config/de
 
 - `:unicorn_bundle_gemfile`
 
-    Sets the BUNDLE_GEMFILE so that unicorn will point at the new Gemfile after unicorn:restart. Defaults to `current/Gemfile`.
+    ***REMOVED in v0.2.0***
+
+    Set the BUNDLE_GEMFILE in a before_exec block in your unicorn.rb. See [sandbox](http://unicorn.bogomips.org/Sandbox.html) and [unicorn-restart-issue-with-capistrano](https://stackoverflow.com/questions/8330577/unicorn-restart-issue-with-capistrano)
+
+- `:unicorn_restart_sleep_time`
+
+    In `unicorn:legacy_restart` send the USR2 signal, sleep for this many seconds (defaults to 3), then send the QUIT signal
 
 ### Setup
 
@@ -73,6 +75,17 @@ namespace :deploy do
 end
 ```
 
+If `preload_app:true` and you need capistrano to cleanup your oldbin pid use:
+
+```ruby
+after 'deploy:publishing', 'deploy:restart'
+namespace :deploy do
+  task :restart do
+    invoke 'unicorn:legacy_restart'
+  end
+end
+```
+
 Otherwise use:
 
 ```ruby

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/capistrano3-unicorn.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano3-unicorn"
-  gem.version       = '0.1.1'
+  gem.version       = '0.2.1'
   gem.authors       = ["Matthew Lineen"]
   gem.email         = ["matthew@lineen.com"]
   gem.description   = "Unicorn specific Capistrano tasks"
@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '>= 3.1.0'
+  gem.add_runtime_dependency 'capistrano', '~> 3.1', '>= 3.1.0'
 end

data/examples/unicorn.rb

@@ -0,0 +1,47 @@
+# paths
+app_path = "/home/example/www.example.com"
+working_directory "#{app_path}/current"
+pid               "#{app_path}/current/tmp/pids/unicorn.pid"
+
+# listen
+listen "/tmp/unicorn-www.example.com.socket", :backlog => 64
+
+# logging
+stderr_path "log/unicorn.stderr.log"
+stdout_path "log/unicorn.stdout.log"
+
+# workers
+worker_processes 3
+
+# use correct Gemfile on restarts
+before_exec do |server|
+  ENV['BUNDLE_GEMFILE'] = "#{app_path}/current/Gemfile"
+end
+
+# preload
+preload_app true
+
+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
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.connection.disconnect!
+  end
+
+  # Before forking, kill the master process that belongs to the .oldbin PID.
+  # This enables 0 downtime deploys.
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      # someone else did our job for us
+    end
+  end
+end
+
+after_fork do |server, worker|
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.establish_connection
+  end
+end

data/lib/capistrano3/tasks/unicorn.rake

@@ -2,11 +2,10 @@ namespace :load do
   task :defaults do
     set :unicorn_pid, -> { File.join(current_path, "tmp", "pids", "unicorn.pid") }
     set :unicorn_config_path, -> { File.join(current_path, "config", "unicorn", "#{fetch(:rails_env)}.rb") }
-    set :unicorn_restart_sleep_time, 3
     set :unicorn_roles, -> { :app }
     set :unicorn_options, -> { "" }
     set :unicorn_rack_env, -> { fetch(:rails_env) == "development" ? "development" : "deployment" }
-    set :unicorn_bundle_gemfile, -> { File.join(current_path, "Gemfile") }
+    set :unicorn_restart_sleep_time, 3
   end
 end
 
@@ -18,7 +17,7 @@ namespace :unicorn do
         if test("[ -e #{fetch(:unicorn_pid)} ] && kill -0 #{pid}")
           info "unicorn is running..."
         else
-          with rails_env: fetch(:rails_env), bundle_gemfile: fetch(:unicorn_bundle_gemfile) do
+          with rails_env: fetch(:rails_env) do
             execute :bundle, "exec unicorn", "-c", fetch(:unicorn_config_path), "-E", fetch(:unicorn_rack_env), "-D", fetch(:unicorn_options)
           end
         end
@@ -56,13 +55,27 @@ namespace :unicorn do
     end
   end
 
-  desc "Restart Unicorn (USR2 + QUIT); use this when preload_app: true"
+  desc "Restart Unicorn (USR2); use this when preload_app: true"
   task :restart do
     invoke "unicorn:start"
     on roles(fetch(:unicorn_roles)) do
       within current_path do
         info "unicorn restarting..."
         execute :kill, "-s USR2", pid
+      end
+    end
+  end
+
+  desc "Duplicate Unicorn; alias of unicorn:restart"
+  task :duplicate do
+    invoke "unicorn:restart"
+  end
+
+  desc "Legacy Restart (USR2 + QUIT); use this when preload_app: true and oldbin pid needs cleanup"
+  task :legacy_restart do
+    invoke "unicorn:restart"
+    on roles(fetch(:unicorn_roles)) do
+      within current_path do
         execute :sleep, fetch(:unicorn_restart_sleep_time)
         if test("[ -e #{fetch(:unicorn_pid)}.oldbin ]")
           execute :kill, "-s QUIT", pid_oldbin

metadata

@@ -1,27 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthew Lineen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: Unicorn specific Capistrano tasks
@@ -31,10 +37,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - capistrano3-unicorn.gemspec
+- examples/unicorn.rb
 - lib/capistrano3-unicorn.rb
 - lib/capistrano3/tasks/unicorn.rake
 - lib/capistrano3/unicorn.rb
@@ -48,17 +58,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Unicorn specific Capistrano tasks