capistrano-resque-pool 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73cc8a2da3270261c3e005501b9ba6ab136cbd3
-  data.tar.gz: 68100579457c1da70704d14f79b23ffb2908fbee
+  metadata.gz: 706da99c97ea705d8c6454c551c18f78212eabed
+  data.tar.gz: 88b38e72e580dbe67f7fb9247c64251f926e17c9
 SHA512:
-  metadata.gz: 9f203a3671a2f1101baf05c370cedbd9a546e5539b4c93abb2a978a3a05b6f04cdf7319f16e879c48580fa7be3c9cb6b896eab5f7265c2aa2eaf240badb6cec9
-  data.tar.gz: 78bebe514803ca6cc092444b71bb2923418d94805ead33b01fd2e7a11a9ea77d33008bc7453204220b408334c48390ff3616df4611e992f792e36210a2c2695f
+  metadata.gz: a1b4780bfd1e5afd6a5e030b4d373ee8566d64ee1737516cab9a5952bc9bcf29d74033dda2b21b26ed9acde19ff849b163f20bf6b513c3b6908b95fd38a3ded8
+  data.tar.gz: 2255a187f57b24ae1047f424fc3372a702095371245dbda09ed87123868b56150f8943251191203c3acc454bd78ad53060d0076225589f9ae1b7599e4be785e0

data/README.md

@@ -34,6 +34,10 @@ Reload the config file, reload logfiles, restart all workers.
 
     bundle exec cap production resque:pool:restart
 
+Gracefully shut down workers, Gracefully shut down manager, start a new manager and it's workers
+
+    bundle exec cap production resque:pool:full_restart
+
 
 ## Contributing
 

data/lib/capistrano/resque/pool/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Resque
     module Pool
-      VERSION = '0.0.2'
+      VERSION = '0.1.0'
     end
   end
 end

data/lib/capistrano/tasks/capistrano-resque-pool.rake

@@ -6,6 +6,7 @@ namespace :resque do
       fetch(:stage)              # so we need to fall back to the stage.
     end
 
+
     desc 'Start all the workers and queus'
     task :start do
       on roles(workers) do
@@ -18,7 +19,15 @@ namespace :resque do
     desc 'Gracefully shut down workers and shutdown the manager after all workers are done'
     task :stop do
       on roles(workers) do
-        execute :kill, "-s QUIT `cat #{pid_path}`"
+        if pid_file_exists? 
+          pid = capture(:cat, pid_path)
+          if test "kill -0 #{pid} > /dev/null 2>&1"
+            execute :kill, "-s QUIT #{pid}"
+          else
+            info "Process #{pid} from #{pid_path} is not running, cleaning up stale PID file"
+            execute :rm, pid_path
+          end
+        end
       end
     end
 
@@ -29,10 +38,30 @@ namespace :resque do
       end
     end
 
+    desc 'Stop the workers and the manager, re-start them (with a different pid)'
+    task :full_restart do
+      invoke 'resque:pool:stop'
+
+      # Wait for the manager to stop
+      on roles(workers) do
+        info "Waiting for pool manager to stop.. " 
+        if pid_file_exists? 
+          pid   = capture(:cat, pid_path)
+          tries = 10
+          while tries >= 0 and test("kill -0 #{pid} > /dev/null 2>&1")
+            tries =- 1
+            sleep 5
+          end
+        end
+      end
+
+      invoke 'resque:pool:start'
+    end
+
     desc 'Reload the config file, reload logfiles, restart all workers'
     task :restart do
       on roles(workers) do
-        if test("[ -f #{pid_path} ]")
+        if pid_file_exists? 
           execute :kill, "-s HUP `cat #{pid_path}`"
         else
           invoke 'resque:pool:start'
@@ -48,6 +77,10 @@ namespace :resque do
       File.join(app_path, '/tmp/pids/resque-pool.pid')
     end
 
+    def pid_file_exists?
+      return test("[ -f #{pid_path} ]")
+    end
+
     def workers
       fetch(:resque_server_roles) || :app
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-resque-pool
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Maxim Abramchuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler