capistrano-resque 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b898f69f6ed18119548b8e823a1e4256a05bacf
-  data.tar.gz: a3125435d75fa17c2178bde81ea35d744ee9a028
+  metadata.gz: fcb1a22ec0a47cbb81286b69622d9ad72cbb0270
+  data.tar.gz: faa6bf544364befa0fb1cb75a2826615267cd854
 SHA512:
-  metadata.gz: 0feb02dd81e7a47541af2b2af9b562278938b95ff40fd83a99de26ff85a9b40e6705cce6fb537b9b9eddbee7163033cd3f04229f8ecf72d129bcb6380a791429
-  data.tar.gz: 8481eeb7d14e711bcac8c218a0c736ea8e706c8d8a929c30291a829742b5f7daa8513a3a87e3acac36192a20b232c81e4ec2aaa9f08ee77f50b3ff70a04034c6
+  metadata.gz: 4dff079d78d320353edd58014605c777939a7391a23912bc558fca5eda02193bd75b06f256fe6bdc118e0e8573c6925b24468ff696b410ef2b2e6647f5c5a18d
+  data.tar.gz: 1ac2ad838229bce32cec733365515e2f7aba1b4793dff4309b279c69b15ec45d3a2ec15b49d4fae8bbbe042112fb9eabde4c82daa8d0298508d1d0b8e33c174f

data/Changelog.md

@@ -1,3 +1,7 @@
+# 0.2.2
+* Start all background tasks with `nohup` to avoid `SIGHUP` problems
+* Add a `:resque_verbose` option to toggle verbose output (defaults to `true`)
+
 # 0.2.1
 * Create the directory for pid files when it doesn't exist
 * Default pid files to `#{shared_path}/tmp/pids` now

data/Gemfile

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

data/Gemfile.lock

@@ -1,18 +1,19 @@
 GIT
-  remote: git://github.com/defunkt/resque.git
-  revision: 3cb5c07dde21500afe17232ec43e6317cc96e6d1
+  remote: git://github.com/resque/resque.git
+  revision: 41469a3eaa9394a60a2ff249c4d00a41f06b4b22
   branch: 1-x-stable
   specs:
-    resque (1.23.0)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
 
 PATH
   remote: .
   specs:
-    capistrano-resque (0.1.0)
+    capistrano-resque (0.2.2)
       capistrano
       resque
       resque-scheduler
@@ -20,39 +21,43 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.14.1)
-      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.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.6.3)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    colorize (0.7.5)
+    i18n (0.7.0)
+    mono_logger (1.1.0)
+    multi_json (1.10.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    rack (1.5.2)
+    rack-protection (1.5.3)
       rack
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    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)
+    rake (10.4.2)
+    redis (3.1.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    resque-scheduler (3.0.0)
+      mono_logger (~> 1.0)
+      redis (~> 3.0)
+      resque (~> 1.25)
+      rufus-scheduler (~> 2.0)
+    rufus-scheduler (2.0.24)
+      tzinfo (>= 0.3.22)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

data/README.md

@@ -3,15 +3,25 @@
 Basic tasks for putting some Resque in your Cap. This should be fully compatible with both Capistrano 2.x and 3.x,
 but if you run into any issues please report them.
 
+At this time, we are only targeting Resque 1.x; the 2.0/master branch is still a work-in-progress without a published gem.
+
 ### In your Gemfile:
 
+```ruby
+gem "capistrano-resque", "~> 0.2.2", require: false
 ```
-gem "capistrano-resque", "~> 0.2.0", require: false
-```
+
+### In lib/tasks:
+
+You'll need to make sure your app is set to include Resque's rake tasks. Per the
+[Resque 1.x README](https://github.com/resque/resque/blob/1-x-stable/README.markdown#in-a-rails-3-app-as-a-gem),
+you'll need to add `require 'resque/tasks'` somewhere under the `lib/tasks` directory (e.g. in a `lib/tasks/resque.rake` file).
 
 ### In your Capfile:
 
-```
+Put this line __after__ any of capistrano's own `require`/`load` statements (specifically `load 'deploy'` for Cap v2):
+
+```ruby
 require "capistrano-resque"
 ```
 
@@ -21,7 +31,11 @@ the `cap` command (e.g. running `rails console`).
 
 ### In your deploy.rb:
 
-```
+```ruby
+# Specify the server that Resque will be deployed on. If you are using Cap v3
+# and have multiple stages with different Resque requirements for each, then
+# these __must__ be set inside of the applicable config/deploy/... stage files
+# instead of config/deploy.rb:
 role :resque_worker, "app_domain"
 role :resque_scheduler, "app_domain"
 
@@ -39,7 +53,7 @@ set :workers, { "my_queue_name" => 2 }
 You can also specify multiple queues and the number of workers
 for each queue:
 
-```
+```ruby
 set :workers, { "archive" => 1, "mailing" => 3, "search_index, cache_warming" => 1 }
 ```
 
@@ -53,7 +67,7 @@ The above will start five workers in total:
 
 You can also start up workers on multiple servers/roles:
 
-```
+```ruby
 role :worker_server_A,  <server-ip-A>
 role :worker_servers_B_and_C,  [<server-ip-B>, <server-ip-C>]
 
@@ -81,13 +95,13 @@ With Rails, Resque requires loading the Rails environment task to have access to
 
 If you would like to load the `environment` task automatically, add this to your `deploy.rb`:
 
-```
+```ruby
 set :resque_environment_task, true
 ```
 
 If you would like your workers to use a different Rails environment than your actual Rails app:
 
-```
+```ruby
 set :resque_rails_env, "my_resque_env"
 ```
 
@@ -111,7 +125,7 @@ cap resque:scheduler:stop    # Stops Resque Scheduler
 To restart you workers automatically when `cap deploy:restart` is executed
 add the following line to your `deploy.rb`:
 
-```
+```ruby
 after "deploy:restart", "resque:restart"
 ```
 
@@ -121,13 +135,13 @@ Backgrounding and logging are current sticking points. I'm using the HEAD of res
 
 In your Gemfile, you will need to specify:
 
-```
+```ruby
 gem 'resque', :git => 'git://github.com/resque/resque.git', :branch => '1-x-stable'
 ```
 
 Also, you will need to include:
 
-```
+```ruby
 Resque.logger = Logger.new("new_resque_log_file")
 ```
 
@@ -145,6 +159,12 @@ If you'd like to capture this output instead, just specify a log file:
 set :resque_log_file, "log/resque.log"
 ```
 
+You can also disable the `VERBOSE` option to reduce the amount of log output:
+
+```ruby
+set :resque_verbose, false
+```
+
 ### Limitations
 
 Starting workers is done concurrently via Capistrano and you are limited by ssh connections limit on your server (default limit is 10)

data/lib/capistrano-resque/capistrano_integration.rb

@@ -11,6 +11,7 @@ module CapistranoResque
         _cset(:interval, "5")
         _cset(:resque_environment_task, false)
         _cset(:resque_log_file, "/dev/null")
+        _cset(:resque_verbose, true)
         _cset(:resque_pid_path) { File.join(shared_path, 'tmp', 'pids') }
 
         def rails_env
@@ -45,9 +46,11 @@ module CapistranoResque
 
         def start_command(queue, pid)
           "cd #{current_path} && RAILS_ENV=#{rails_env} QUEUE=\"#{queue}\" \
-           PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 INTERVAL=#{interval} \
-           #{fetch(:bundle_cmd, "bundle")} exec rake \
-           #{"environment" if fetch(:resque_environment_task)} \
+           PIDFILE=#{pid} BACKGROUND=yes \
+           #{"VERBOSE=1 " if fetch(:resque_verbose)}\
+           INTERVAL=#{interval} \
+           nohup #{fetch(:bundle_cmd, "bundle")} exec rake \
+           #{"environment " if fetch(:resque_environment_task)}\
            resque:work #{output_redirection}"
         end
 
@@ -74,8 +77,12 @@ module CapistranoResque
 
         def start_scheduler(pid)
           "cd #{current_path} && RAILS_ENV=#{rails_env} \
-           PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 MUTE=1 \
-           #{fetch(:bundle_cmd, "bundle")} exec rake resque:scheduler #{output_redirection}"
+           PIDFILE=#{pid} BACKGROUND=yes \
+           #{"VERBOSE=1 " if fetch(:resque_verbose)}\
+           MUTE=1 \
+           nohup #{fetch(:bundle_cmd, "bundle")} exec rake \
+           #{"environment " if fetch(:resque_environment_task)}\
+           resque:scheduler #{output_redirection}"
         end
 
         def stop_scheduler(pid)

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

@@ -5,6 +5,7 @@ namespace :load do
     set :interval, "5"
     set :resque_environment_task, false
     set :resque_log_file, "/dev/null"
+    set :resque_verbose, true
     set :resque_pid_path, -> { File.join(shared_path, 'tmp', 'pids') }
   end
 end
@@ -68,7 +69,7 @@ namespace :resque do
           number_of_workers.times do
             pid = "#{fetch(:resque_pid_path)}/resque_work_#{worker_id}.pid"
             within current_path do
-              execute :rake, %{RAILS_ENV=#{rails_env} QUEUE="#{queue}" PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 INTERVAL=#{fetch(:interval)} #{"environment" if fetch(:resque_environment_task)} resque:work #{output_redirection}}
+              execute :nohup, %{#{SSHKit.config.command_map[:rake]} RAILS_ENV=#{rails_env} QUEUE="#{queue}" PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}INTERVAL=#{fetch(:interval)} #{"environment " if fetch(:resque_environment_task)}resque:work #{output_redirection}}
             end
             worker_id += 1
           end
@@ -128,7 +129,7 @@ namespace :resque do
         create_pid_path
         pid = "#{fetch(:resque_pid_path)}/scheduler.pid"
         within current_path do
-          execute :rake, %{RAILS_ENV=#{rails_env} PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 MUTE=1 resque:scheduler #{output_redirection}}
+          execute :nohup, %{#{SSHKit.config.command_map[:rake]} RAILS_ENV=#{rails_env} PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}MUTE=1 #{"environment " if fetch(:resque_environment_task)}resque:scheduler #{output_redirection}}
         end
       end
     end

data/lib/capistrano-resque/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-resque
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Steven Shingler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Resque integration for Capistrano