deploy restarts resque-pool with --hot-swap

curationexperts · Jun 2, 2017 · d303850 · d303850
1 parent 1bfcb2a
commit d303850
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,8 @@ gem 'pg'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.2'
 # use resque-pool for background jobs
-gem 'resque-pool'
+# need master from github to get hot-swap functionality
+gem 'resque-pool', github: 'nevans/resque-pool'
 gem 'resque-web', require: 'resque_web'
 gem 'rsolr', '~> 1.0'
 # Use SCSS for stylesheets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/nevans/resque-pool.git
+  revision: ec81c92df41ecdbdecaea55863964baf3e9e03ad
+  specs:
+    resque-pool (0.7.0.dev)
+      rake
+      resque (~> 1.22)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -576,9 +584,6 @@ GEM
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-pool (0.6.0)
-      rake
-      resque (~> 1.22)
     resque-web (0.0.11)
       coffee-rails
       font-awesome-sass
@@ -778,7 +783,7 @@ DEPENDENCIES
   mail (= 2.6.6.rc1)
   pg
   rails (~> 5.0.2)
-  resque-pool
+  resque-pool!
   resque-web
   rsolr (~> 1.0)
   rspec (~> 3.5)
@@ -800,4 +805,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.6
+   1.15.1
diff --git a/lib/capistrano/tasks/resque.rake b/lib/capistrano/tasks/resque.rake
@@ -16,7 +16,7 @@ namespace :resque do
     task :start do
       on roles(:resque_pool), in: :sequence, wait: 10 do
         # Starts a new resque_pool master
-        execute "cd #{release_path} && bundle exec resque-pool -d -E #{fetch(:rails_env)} -c config/resque-pool.yml -p #{shared_path}/tmp/pids/resque-pool.pid"
+        execute "cd #{release_path} && bundle exec resque-pool -d -E #{fetch(:rails_env)} -c config/resque-pool.yml --lock #{shared_path}/tmp/resque-pool.lock --hot-swap"
       end
     end