diff --git a/lib/capistrano/tasks/app.rake b/lib/capistrano/tasks/app.rake index 1a0677fb9..f92a6a8ea 100644 --- a/lib/capistrano/tasks/app.rake +++ b/lib/capistrano/tasks/app.rake @@ -9,7 +9,7 @@ namespace :app do # do nothing else invoke "web:disable" - invoke "unicorn:terminate" + invoke "unicorn:stop" end end diff --git a/lib/capistrano/tasks/unicorn.rake b/lib/capistrano/tasks/unicorn.rake deleted file mode 100644 index 2c2240691..000000000 --- a/lib/capistrano/tasks/unicorn.rake +++ /dev/null @@ -1,25 +0,0 @@ -# https://bogomips.org/unicorn/SIGNALS.html -namespace :unicorn do - desc "Terminate unicorn processes (blocks until complete)" - task :terminate do - on roles(:app) do - within current_path do - kill_unicorn("SIGQUIT") - execute :sleep, 10 - kill_unicorn("SIGTERM") - execute :sleep, 2 - kill_unicorn("SIGKILL") - end - end - end - - def unicorn_running? - test("[ -f #{fetch(:unicorn_pid)} ] && pkill --count --pidfile #{fetch(:unicorn_pid)}") - end - - def kill_unicorn(signal) - if unicorn_running? - execute :pkill, "--signal #{signal}", "--pidfile #{fetch(:unicorn_pid)}" - end - end -end