capistrano-hivequeen 2.1.1 → 2.2.0

data/lib/capistrano/hivequeen/capistrano_configuration.rb

@@ -24,8 +24,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   # From the command line, use -s override=true to force a deployment
   set :override, false
 
-  # Time to wait for Background jobs processes to start/stop
-  set :bg_wait_time, 30
+  # If a delayed_job worker doesn't stop/restart in time (probably b/c a slow job is running)
+  # trust that runit will eventually stop/restart the worker
+  set :tolerate_slow_bg, true
 
   # Option to skip background tasks
   set :skip_bg, false

data/lib/capistrano/hivequeen/deploy.rb

@@ -92,12 +92,15 @@ Capistrano::Configuration.instance.load do
     %w(start stop restart).each do |action|
       desc "#{action} the delayed_job processes"
       task action, :roles => fetch(:bg_roles, [:bg]) do
-        next if skip_bg
         begin
-          run "sv -w #{bg_wait_time } #{action} `cd /etc/service; ls -d dj_*`"
+          run "sv #{action} `cd /etc/service; ls -d dj_*`"
         rescue Capistrano::CommandError
-          logger.debug "Error running bg:#{action}. Consider running with '-s skip_bg=true'"
-          raise $!
+          if tolerate_slow_bg
+            logger.info "Some bg workers did not #{action} quickly, but will #{action} when the current job finishes."
+            logger.info "Consider running with '-s tolerate_slow_bg=false'"
+          else
+            raise $!
+          end
         end
       end
 

data/lib/capistrano/hivequeen/version.rb

@@ -1,6 +1,6 @@
 class HiveQueen
   class Version
-    @@version = '2.1.1'
+    @@version = '2.2.0'
 
     def self.to_s
       @@version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70250611877500 !ruby/object:Gem::Requirement
+  requirement: &70215770599560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250611877500
+  version_requirements: *70215770599560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70250611876900 !ruby/object:Gem::Requirement
+  requirement: &70215770599020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250611876900
+  version_requirements: *70215770599020
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70250611875500 !ruby/object:Gem::Requirement
+  requirement: &70215770591500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250611875500
+  version_requirements: *70215770591500
 description: Capistrano extensions for interacting with HiveQueen
 email: aaron@kickstarter.com
 executables: []