capistrano-simple-unicorn 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df79405fad12617cc4b14c958b227fe1457ed8a
-  data.tar.gz: 34edfca6a9588b0609804d88beb351d1b1b60856
+  metadata.gz: '08716c38cf242db16b46c00b7575ce8b39fe1906'
+  data.tar.gz: e47a573ac35e442613bb5549c20e7deb790b10d0
 SHA512:
-  metadata.gz: e844108038b73cb72a58b48a18e4e826c2a9ea065304a539a91af829e44def83ed43635e95ae97bcf79aea8554a3b47a911300df531762b0462496440c89fd80
-  data.tar.gz: ce0b05c0f951b9da82c07076cb7b1d237a7052062b7d037b20f13b0bf49b4e36f02323a63f36d7b1eba45ac2a6f45857cda70f9c194b3b12ad891450145aa997
+  metadata.gz: fbeca25cf799f0a32261d203fdec7d5251711de7ffc6210afc35f71d7400da15e5f97f12643b9a6023ab9e543b8eaec43df9609eaba1f6f7b9ce87c4b297330d
+  data.tar.gz: 7abaae55f9462f0b3f059ba4999c6a2b7fea93b365b382f281c27fe0618b7bebb07429513d917c2fc7268e3f77ae788ed1959eebef236a87a0fb4f2b88c27cff

data/README.md

@@ -40,9 +40,9 @@ Default value:
 ```
 set :unicorn_service, -> { "unicorn_#{fetch(:application)}" }
 set :user_home_path, -> { "/home/#{fetch(:user)}" }
-set :unicorn_config_path, -> { shared_path.join("config", "unicorn.rb") }
-set :unicorn_pid_path, -> { shared_path.join("tmp", "pids", "unicorn.pid") }
-set :unicorn_sock_path, -> { shared_path.join("tmp", "unicorn.sock") }
+set :unicorn_config_file, -> { shared_path.join("config", "unicorn.rb") }
+set :unicorn_pid_file, -> { shared_path.join("tmp", "pids", "unicorn.pid") }
+set :unicorn_sock_file, -> { shared_path.join("tmp", "unicorn.sock") }
 set :unicorn_log_file, -> { shaed_path.join("log", "unicorn.stdout.log") }
 set :unicorn_error_log_file, -> {shared_path.join("log","unicorn.stderr.log")}
 set :ruby_version, -> { fetch(:rvm_ruby_version) || fetch(:rbenv_ruby) }
@@ -96,5 +96,5 @@ set :nginx_upstream_file, "/tmp/unicorn.sock"
     set :nginx_fail_timeout, 0
     set :nginx_access_log_file, -> { "/var/log/nginx/#{fetch(:nginx_config_name)}.access.log" } # access log file
     set :nginx_error_log_file, -> { "/var/log/nginx/#{fetch(:nginx_config_name)}.error.log" } # error log file
-    set :nginx_upstream_file, -> { "#{fetch(:unicorn_sock_path)}" } # .sock file path
+    set :nginx_upstream_file, -> { "#{fetch(:unicorn_sock_file)}" } # .sock file path
 ```

data/lib/capistrano/simple_unicorn/helpers.rb

@@ -44,15 +44,15 @@ module Capistrano
         "/etc/init.d/#{fetch(:unicorn_service)}"
       end
 
-      def unicorn_sock_path
+      def unicorn_sock_file
         shared_path.join("tmp", "unicorn.sock")
       end
 
-      def unicorn_config_path
+      def unicorn_config_file
         shared_path.join("config", "unicorn.rb")
       end
 
-      def unicorn_pid_path
+      def unicorn_pid_file
         shared_path.join("tmp", "pids", "unicorn.pid")
       end
 

data/lib/capistrano/simple_unicorn/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module SimpleUnicorn
-    VERSION = '1.1.4'.freeze
+    VERSION = '1.1.5'.freeze
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -10,7 +10,7 @@ namespace :load do
     set :nginx_fail_timeout, 0
     set :nginx_access_log_file, -> { "/var/log/nginx/#{fetch(:nginx_config_name)}.access.log" }
     set :nginx_error_log_file, -> { "/var/log/nginx/#{fetch(:nginx_config_name)}.error.log" }
-    set :nginx_upstream_file, -> { "#{fetch(:unicorn_sock_path)}" }
+    set :nginx_upstream_file, -> { "#{fetch(:unicorn_sock_file)}" }
   end
 end
 

data/lib/capistrano/tasks/unicorn.rake

@@ -5,15 +5,11 @@ namespace :load do
   task :defaults do
     set :unicorn_service, -> { "unicorn_#{fetch(:application)}" }
     set :user_home_path, -> { "/home/#{fetch(:user)}" }
-    set :unicorn_config_path, -> { unicorn_config_path }
-    set :unicorn_pid_path, -> { unicorn_pid_path }
-    set :unicorn_sock_path, -> { unicorn_sock_path }
-    set :unicorn_stdout_path, -> { unicorn_log_file }
-    set :unicorn_stderr_path, -> { unicorn_error_log_file }
-    set :unicorn_roles, -> { :app }
-    set :unicorn_restart_sleep_time, 3
-    set :unicorn_options, -> { '' }
-    set :unicorn_env, -> { fetch(:rails_env) || 'deployment' }
+    set :unicorn_config_file, -> { unicorn_config_file }
+    set :unicorn_pid_file, -> { unicorn_pid_file }
+    set :unicorn_sock_file, -> { unicorn_sock_file }
+    set :unicorn_log_file, -> { unicorn_log_file }
+    set :unicorn_error_log_file, -> { unicorn_error_log_file }
     set :ruby_version, -> { fetch(:rvm_ruby_version) || fetch(:rbenv_ruby) }
     set :unicorn_worker_processes, 2
     set :unicorn_timeout, 30
@@ -23,115 +19,52 @@ namespace :load do
 end
 
 namespace :unicorn do
-  desc "Unicorn generate config file"
-  task :setup do
-    on roles(fetch(:unicorn_roles)) do
-      unless file_exists? fetch(:unicorn_config_path)
-        execute :mkdir, '-pv', File.dirname(fetch(:unicorn_config_path))
-        upload! template('unicorn.rb.erb'), fetch(:unicorn_config_path)
+  desc 'Unicorn Initializer'
+  task :unicorn_init do
+    on roles :app do
+      sudo_upload! template('unicorn_init.erb'), unicorn_initd_file
+      execute :chmod, '+x', unicorn_initd_file
+      if os_is_ubuntu?
+        sudo 'update-rc.d', '-f', fetch(:unicorn_service), 'defaults'
+      else
+        sudo 'chkconfig', '--add', fetch(:unicorn_service)
       end
     end
   end
 
-  desc "Start Unicorn"
-  task :start do
-    on roles(fetch(:unicorn_roles)) do
-      within current_path do
-        if test("[ -e #{fetch(:unicorn_pid_path)} ] && kill -0 #{pid}")
-          info "unicorn is running..."
-        else
-          with rails_env: fetch(:rails_env) do
-            execute :bundle, "exec unicorn", "-c", fetch(:unicorn_config_path), "-E", fetch(:unicorn_env), "-D", fetch(:unicorn_options)
-          end
-        end
+  desc 'Setup unicorn config'
+  task :setup_unicorn_config do
+    on roles :app do
+      unless file_exists? fetch(:unicorn_config_file)
+        execute :mkdir, '-pv', File.dirname(fetch(:unicorn_config_file))
       end
+      upload! template('unicorn.rb.erb'), fetch(:unicorn_config_file)
     end
   end
 
-  desc "Stop Unicorn (QUIT)"
-  task :stop do
-    on roles(fetch(:unicorn_roles)) do
-      within current_path do
-        if test("[ -e #{fetch(:unicorn_pid_path)} ]")
-          if test("kill -0 #{pid}")
-            info "stopping unicorn..."
-            execute :kill, "-s QUIT", pid
-          else
-            info "cleaning up dead unicorn pid..."
-            execute :rm, fetch(:unicorn_pid_path)
-          end
-        else
-          info "unicorn is not running..."
-        end
+  %w[start stop restart upgrade].each do |action|
+    desc "#{action} unicorn"
+    task action do
+      on roles :app do
+        sudo :service, fetch(:unicorn_service), action
       end
     end
   end
 
-  desc "Reload Unicorn (HUP); use this when preload_app: false"
-  task :reload do
-    invoke "unicorn:start"
-    on roles(fetch(:unicorn_roles)) do
-      within current_path do
-        info "reloading..."
-        execute :kill, "-s HUP", pid
+  desc 'restart unicorn'
+  task 'reload' do
+    on roles :app do
+      invoke "unicorn:unicorn_init" unless file_exists?(unicorn_initd_file)
+      invoke 'unicorn:setup_unicorn_config'
+      if test "[ -f #{fetch(:unicorn_pid)} ]"
+        sudo 'service', fetch(:unicorn_service), 'restart'
+      else
+        sudo 'service', fetch(:unicorn_service), 'start'
       end
     end
   end
-
-  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_path)}.oldbin ]")
-          execute :kill, "-s QUIT", pid_oldbin
-        end
-      end
-    end
-  end
-
-  desc "Add a worker (TTIN)"
-  task :add_worker do
-    on roles(fetch(:unicorn_roles)) do
-      within current_path do
-        info "adding worker"
-        execute :kill, "-s TTIN", pid
-      end
-    end
-  end
-
-  desc "Remove a worker (TTOU)"
-  task :remove_worker do
-    on roles(fetch(:unicorn_roles)) do
-      within current_path do
-        info "removing worker"
-        execute :kill, "-s TTOU", pid
-      end
-    end
-  end
-end
-
-def pid
-  "`cat #{fetch(:unicorn_pid_path)}`"
 end
 
-def pid_oldbin
-  "`cat #{fetch(:unicorn_pid_path)}.oldbin`"
+namespace :deploy do
+  after :publishing, 'unicorn:reload'
 end

data/lib/generators/capistrano/simple_unicorn/templates/unicorn.rb.erb

@@ -1,36 +1,26 @@
 worker_processes <%= fetch(:unicorn_worker_processes) %>
 timeout <%= fetch(:unicorn_timeout) %>
-app_path = "<%= fetch(:deploy_to) %>"
-listen "<%= fetch(:unicorn_sock_path) %>"
-pid "<%= fetch(:unicorn_pid_path) %>"
 
-stderr_path "<%= fetch(:unicorn_stderr_path) %>"
-stdout_path "<%= fetch(:unicorn_stdout_path %>"
+listen "<%= fetch(:unicorn_sock_file) %>"
+pid "<%= fetch(:unicorn_pid_file) %>"
 
-preload_app true
-
-# use correct Gemfile on restarts
-before_exec do |server|
-  ENV['BUNDLE_GEMFILE'] = "#{app_path}/current/Gemfile"
-end
+stderr_path "<%= fetch(:unicorn_error_log_file) %>"
+stdout_path "<%= fetch(:unicorn_log_file) %>"
 
 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
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
 
-  # 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
+  old_pid = "#{ server.config[:pid] }.oldbin"
+  unless old_pid == server.pid
     begin
-      Process.kill("QUIT", File.read(old_pid).to_i)
+      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|
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+end

data/lib/generators/capistrano/simple_unicorn/templates/unicorn_init.erb

@@ -11,11 +11,11 @@
 set -e
 HOME=<%= fetch(:user_home_path) %>
 APP_ROOT=<%= current_path %>
-PID=<%= fetch(:unicorn_pid_path) %>
+PID=<%= fetch(:unicorn_pid_file) %>
 USER=<%= fetch(:user) %>
 ENV="<%= fetch(:stage) %>"
 RUBY_VERSION="<%= fetch(:ruby_version) %>"
-CONFIG_FILE="<%= fetch(:unicorn_config_path) %>"
+CONFIG_FILE="<%= fetch(:unicorn_config_file) %>"
 CMD="cd $APP_ROOT && export RBENV_ROOT="$HOME/.rbenv" RBENV_VERSION=$RUBY_VERSION; $HOME/.rbenv/bin/rbenv exec bundle exec unicorn -c $CONFIG_FILE -E $ENV -D"
 
 set -u

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-simple-unicorn
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - truongkma