capistrano-resque 0.0.7 → 0.0.8

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 
-gem 'resque', '~> 1.21.0'
+gem 'resque', :git => 'git://github.com/defunkt/resque.git', :branch => '1-x-stable'
+gem 'resque-scheduler'
 
 gemspec

data/Gemfile.lock

@@ -1,43 +1,58 @@
+GIT
+  remote: git://github.com/defunkt/resque.git
+  revision: 3cb5c07dde21500afe17232ec43e6317cc96e6d1
+  branch: 1-x-stable
+  specs:
+    resque (1.23.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+
 PATH
   remote: .
   specs:
-    capistrano-resque (0.0.6)
+    capistrano-resque (0.0.8)
       capistrano
+      resque
+      resque-scheduler
 
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.12.0)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    highline (1.6.13)
+    highline (1.6.15)
     multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
+    net-ssh (2.6.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
-    redis (3.0.1)
-    redis-namespace (1.2.0)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
       redis (~> 3.0.0)
-    resque (1.21.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    sinatra (1.3.2)
+    resque-scheduler (2.0.0)
+      redis (>= 2.0.1)
+      resque (>= 1.20.0)
+      rufus-scheduler
+    rufus-scheduler (2.0.17)
+      tzinfo (>= 0.3.23)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
+    tzinfo (0.3.34)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -46,4 +61,5 @@ PLATFORMS
 
 DEPENDENCIES
   capistrano-resque!
-  resque (~> 1.21.0)
+  resque!
+  resque-scheduler

data/README.md

@@ -1,3 +1,7 @@
+# Changes
+
+Using SIGQUIT to kill processes as they aren't terminating properly.
+
 # Capistrano Resque
 
 Basic tasks for putting some Resque in your Cap.
@@ -11,6 +15,9 @@ require "capistrano-resque"
 ### In your deploy.rb:
 
 ```
+role :resque_worker, "app_domain"
+role :resque_scheduler, "app_domain"
+
 set :workers, { "my_queue_name" => 2 }
 ```
 
@@ -33,6 +40,7 @@ Running cap -vT | grep resque should give you...
 
 ```
 ➔ cap -vT | grep resque
+cap resque:status    # Check worksers status
 cap resque:start     # Start Resque workers
 cap resque:stop      # Quit running Resque workers
 cap resque:restart   # Restart running Resque workers
@@ -51,9 +59,23 @@ after "deploy:restart", "resque:restart"
 ```
 ### Logging
 
-I've decided to lose the logging ability altogether, in order to keep up with recent versions of Resque, following the chatter on: https://github.com/defunkt/resque/pull/450
+Backgrounding and logging are current sticking points. I'm using the HEAD of resque's 1-x-stable branch for the 0.0.8 release because it has some new logging functions not yet slated for a resque release.
+
+In your Gemfile, you will need to specify:
+
+```
+gem 'resque', :git => 'git://github.com/defunkt/resque.git', :branch => '1-x-stable'
+```
+
+Also, you will need to include:
+
+```
+Resque.logger = Logger.new("new_resque_log_file")
+```
+
+...somewhere sensible, such as in your resque.rake, to achieve logging.
 
-If logging is important to you, there's still the 0.0.4 release of this project.
+The chatter on: https://github.com/defunkt/resque/pull/450 gives more information. If using HEAD of this resque branch doesn't work for you, then pin to v0.0.7 of this project.
 
 ### License
 

data/capistrano-resque.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "capistrano"
+  gem.add_runtime_dependency "resque"
+  gem.add_runtime_dependency "resque-scheduler"
 end

data/lib/capistrano-resque/capistrano_integration.rb

@@ -7,6 +7,7 @@ module CapistranoResque
       capistrano_config.load do
 
         _cset(:workers, {"*" => 1})
+        _cset(:resque_kill_signal, "QUIT")
 
         def workers_roles
           return workers.keys if workers.first[1].is_a? Hash
@@ -23,13 +24,43 @@ module CapistranoResque
           end
         end
 
+        def status_command
+          "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
+            for f in $(ls #{current_path}/tmp/pids/resque_work*.pid); \
+              do ps -p $(cat $f) | sed -n 2p ; done \
+           ;fi"
+        end
+
+        def start_command(queue, pid)
+          "cd #{current_path} && RAILS_ENV=#{rails_env} QUEUE=\"#{queue}\" \
+           PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 \
+           #{fetch(:bundle_cmd, "bundle")} exec rake environment resque:work"
+        end
+
+        def stop_command
+          "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
+           for f in `ls #{current_path}/tmp/pids/resque_work*.pid`; \
+             do #{try_sudo} kill -s #{resque_kill_signal} `cat $f` \
+             && rm $f ;done \
+           ;fi"
+        end
+
+        def start_scheduler(pid)
+          "cd #{current_path} && RAILS_ENV=#{rails_env} \
+           PIDFILE=#{pid} BACKGROUND=yes \
+           #{fetch(:bundle_cmd, "bundle")} exec rake resque:scheduler"
+        end
+
+        def stop_scheduler(pid)
+          "if [ -e #{pid} ]; then \
+            #{try_sudo} kill $(cat #{pid}) ; rm #{pid} \
+           ;fi"
+        end
+
         namespace :resque do
           desc "See current worker status"
           task :status, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
-            command = "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
-                for f in $(ls #{current_path}/tmp/pids/resque_work*.pid); do ps -p $(cat $f) | sed -n 2p ;done \
-               ;fi"
-            run(command)
+            run(status_command)
           end
 
           desc "Start Resque workers"
@@ -40,21 +71,22 @@ module CapistranoResque
                 puts "Starting #{number_of_workers} worker(s) with QUEUE: #{queue}"
                 number_of_workers.times do
                   pid = "./tmp/pids/resque_work_#{worker_id}.pid"
-                  run("cd #{current_path} && RAILS_ENV=#{rails_env} QUEUE=\"#{queue}\" \
-                   PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 #{fetch(:bundle_cmd, "bundle")} exec rake environment resque:work >> #{shared_path}/log/resque.log 2>&1 &", 
-                      :roles => role)
+                  run(start_command(queue, pid), :roles => role)
                   worker_id += 1
                 end
               end
             end
           end
 
+          # See https://github.com/defunkt/resque#signals for a descriptions of signals
+          # QUIT - Wait for child to finish processing then exit (graceful)
+          # TERM / INT - Immediately kill child then exit (stale or stuck)
+          # USR1 - Immediately kill child but don't exit (stale or stuck)
+          # USR2 - Don't start to process any new jobs (pause)
+          # CONT - Start to process new jobs again after a USR2 (resume)
           desc "Quit running Resque workers"
           task :stop, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
-            command = "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
-              for f in `ls #{current_path}/tmp/pids/resque_work*.pid`; do #{try_sudo} kill `cat $f` ; rm $f ;done \
-              ;fi"
-            run(command)
+            run(stop_command)
           end
 
           desc "Restart running Resque workers"
@@ -66,18 +98,14 @@ module CapistranoResque
           namespace :scheduler do
             desc "Starts resque scheduler with default configs"
             task :start, :roles => :resque_scheduler do
-              run "cd #{current_path} && RAILS_ENV=#{rails_env} \
-PIDFILE=./tmp/pids/scheduler.pid BACKGROUND=yes bundle exec rake resque:scheduler >> #{shared_path}/log/resque_scheduler.log 2>&1 &"
+              pid = "#{current_path}/tmp/pids/scheduler.pid"
+              run(start_scheduler(pid))
             end
 
             desc "Stops resque scheduler"
             task :stop, :roles => :resque_scheduler do
               pid = "#{current_path}/tmp/pids/scheduler.pid"
-              command = "if [ -e #{pid} ]; then \
-                #{try_sudo} kill $(cat #{pid}) ; rm #{pid} \
-                ;fi"
-              run(command)
-              
+              run(stop_scheduler(pid))
             end
 
             task :restart do

data/lib/capistrano-resque/version.rb

@@ -1,5 +1,5 @@
 module CapistranoResque
   unless defined?(::CapistranoResque::VERSION)
-    VERSION = "0.0.7".freeze
+    VERSION = "0.0.8".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-resque
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70296963636080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,44 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296963636080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capistrano plugin that integrates Resque server tasks.
 email: shingler@gmail.com
 executables: []
@@ -58,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Resque integration for Capistrano