capistrano-resque 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    capistrano-resque (0.0.3)
+    capistrano-resque (0.0.4)
       capistrano
 
 GEM
@@ -24,13 +24,13 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    highline (1.6.11)
+    highline (1.6.13)
     multi_json (1.3.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rack (1.4.1)

data/README.md

@@ -11,11 +11,25 @@ require "capistrano-resque"
 ### In your deploy.rb:
 
 ```
-set :queue_name, "my_queue_name"
-set :num_of_queues, 2
+set :workers, { "my_queue_name" => 2 }
 ```
 
-Then, running cap -vT | grep resque should give you...
+You can also specify multiple queues and the number of workers
+for each queue:
+
+```
+set :workers, { "archive" => 1, "mailing" => 3, "search_index, cache_warming" => 1 }
+```
+
+The above will start five workers in total:
+
+ * one listening on the `archive` queue
+ * one listening on the `search_index, cache_warming` queue
+ * three listening on the `mailing` queue
+
+### The tasks
+
+Running cap -vT | grep resque should give you...
 
 ```
 ➔ cap -vT | grep resque
@@ -24,7 +38,7 @@ cap resque:stop      # Quit running Resque workers
 cap resque:restart   # Restart running Resque workers
 ```
 
-### Restart on deployer
+### Restart on deployment
 
 To restart you workers automatically when `cap deploy:restart` is executed
 add the following line to your `deploy.rb`:
@@ -33,3 +47,6 @@ add the following line to your `deploy.rb`:
 after "deploy:restart", "resque:restart"
 ```
 
+## Logging
+
+Currently, resque doesn't log to a logfile. I'm using the 'logfile' branch of http://github.com/sj26/resque in my consuming Gemfile to achieve this functionality. Hopefully that will get merged into defunkt/resque soon.

data/lib/capistrano-resque/capistrano_integration.rb

@@ -6,8 +6,7 @@ module CapistranoResque
     def self.load_into(capistrano_config)
       capistrano_config.load do
 
-        _cset(:num_of_queues, 1)
-        _cset(:queue_name, "*")
+        _cset(:workers, {"*" => 1})
         _cset(:app_env, (fetch(:rails_env) rescue "production"))
         _cset(:verbosity, 1)
 
@@ -20,7 +19,7 @@ module CapistranoResque
         end
 
         def current_pids
-          capture("ls #{current_path}/tmp/pids/resque_work*.pid").strip.split(/\r{0,1}\n/)
+          capture("ls #{current_path}/tmp/pids/resque_work*.pid 2>/dev/null || true").strip.split(/\r{0,1}\n/)
         end
 
         namespace :resque do
@@ -39,12 +38,16 @@ module CapistranoResque
 
           desc "Start Resque workers"
           task :start do
-            puts "Starting #{num_of_queues} worker(s) with QUEUE: #{queue_name}"
-            num_of_queues.times do |i|
-              pid = "./tmp/pids/resque_worker_#{i}.pid"
-              run "cd #{current_path} && RAILS_ENV=#{app_env} QUEUE=#{queue_name} \
-PIDFILE=#{pid} BACKGROUND=yes LOGFILE=./log/resque-worker#{i}.log VVERBOSE=#{verbosity}  \
-bundle exec rake environment resque:work"
+            worker_id = 1
+            workers.each_pair do |queue, number_of_workers|
+              puts "Starting #{number_of_workers} worker(s) with QUEUE: #{queue}"
+              number_of_workers.times do
+                pid = "./tmp/pids/resque_worker_#{worker_id}.pid"
+                run "cd #{current_path} && RAILS_ENV=#{app_env} QUEUE=\"#{queue}\" \
+  PIDFILE=#{pid} BACKGROUND=yes LOGFILE=./log/resque-worker#{worker_id}.log VVERBOSE=#{verbosity}  \
+  bundle exec rake environment resque:work"
+                worker_id += 1
+              end
             end
           end
 

data/lib/capistrano-resque/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-resque
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Steven Shingler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano