capistrano3-delayed-job 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8695030201916e5d7ee2fc013b575eb49d6b6fbc
-  data.tar.gz: 579d7a880bfb07b87b5391ffd4be995bf2e2506c
+  metadata.gz: e4de514ccab20aa23140b8cac3c61332bb68dce1
+  data.tar.gz: 4a13b80787dc7fa7810dab0ae157ce2400fe3fe2
 SHA512:
-  metadata.gz: cf85dce5eaa6b9aac31e7e24a53e809a0a3cd1faa781c16f33173fa6cc9719b536d4c1fd373210d624d67090dad5cc11167f356c0466746f9f71327825086db6
-  data.tar.gz: a2da0ccad039e29fbd8baada6cb1542a27123bdbb2e403bf1bc0b3e505a126d76e6283125bd77b364f17c77fc71af2b9116a7f0328dd90bf1e0181c9a841c3c4
+  metadata.gz: d7510caa20a3d7279bff7baf4c910d5237dc1f08eb98ada5df66e48e59121e417cfbd3b2b441d84f0c59133b2c45fa70211e775dacad5b50275d5e7bcf54fd55
+  data.tar.gz: ebdd7821c73264e3407160d7e1f4c229c522755c62b17f4c74100290576d480fd04cd5b354d6889387bb86bebb8a252c9dac2846a16105ebda6fe9fecfd67c8d

data/README.md

@@ -79,6 +79,27 @@ set :delayed_job_queues, ['mailer','tracking']
 #     'high_priority,*,low_priority' => 1, # works on whatever is available
 #     '*,low_priority' => 1,  # high_priority doesn't starve the little guys
 #   }
+
+# If you have several servers handling Delayed Jobs and you want to configure
+# different pools per server, you can define delayed_job_pools_per_server:
+#
+# set :delayed_job_pools_per_server, {
+#   'server11-prod' => {
+#     'default,emails' => 3,
+#     'loud_notifications' => 1,
+#     'silent_notifications' => 1,
+#   },
+#   'server12-prod' => {
+#     'default' => 2
+#   }
+# }
+
+# Server names (server11-prod, server12-prod) in :delayed_job_pools_per_server
+# must match the hostnames on Delayed Job servers. You can verify it by running
+# `hostname` on your servers.
+
+# If you use :delayed_job_pools_per_server, :delayed_job_pools will be ignored.
+
 # Identification is assigned in order 0..3.
 # Note that the '*' in this case is actually a queue with that name and does
 # not mean any queue as it is not used alone, but alongside other queues.
@@ -109,11 +130,19 @@ It also conditionally adds the following hook:
 
 ```ruby
   if Rake::Task.task_defined?('deploy:published')
-    after 'deploy:published', 'delayed_job:restart'
+    after 'deploy:published', 'delayed_job:default'
+  end
+```
+
+Where the `delayed_job:default` is defined as:
+
+```ruby
+  task :default do
+    invoke 'delayed_job:restart' if fetch(:delayed_job_default_hooks, true)
   end
 ```
 
-You can disable default hook by setting `delayed_job_default_hooks` to `false`. (It still gets _defined_, but will not do anything when called.)
+Thus you can disable default hook by setting `delayed_job_default_hooks` to `false`. (It still gets _defined_, but will not do anything when called.)
 
 ```ruby
 set :delayed_job_default_hooks, false
@@ -145,8 +174,7 @@ Thank you [contributors](https://github.com/AgileConsultingLLC/capistrano3-delay
 capistrano3-delayed-job is maintained [Rob Biedenharn](https://github.com/rab) and
 [![Logo of Agile Consulting LLC](http://agileconsultingllc.com/agile-logo-small.png "Agile Consulting LLC")](http://agileconsultingllc.com/)
 
-Originally developed by [platanus](http://platan.us).
-[<img src="http://platan.us/gravatar_with_text.png" alt="Platanus" width="125"/>](http://platan.us/)
+Originally developed by [Platanus](http://platan.us).
 
 ## License
 

data/capistrano3-delayed-job.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano3-delayed-job"
-  spec.version       = "1.7.3"
+  spec.version       = "1.7.4"
   spec.authors       = ["Rob Biedenharn",
                         "Juan Ignacio Donoso",
                         "Agustin Feuerhake",

data/lib/capistrano/tasks/delayed_job.rake

@@ -1,6 +1,6 @@
-# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
-# rubocop:disable Metrics/PerceivedComplexity, Style/EmptyLinesAroundBlockBody
-# rubocop:disable Style/SpaceInsideParens
+# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength
+# rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+# rubocop:disable Style/SpaceInsideParens, Style/EmptyLinesAroundBlockBody
 
 namespace :delayed_job do
 
@@ -12,7 +12,10 @@ namespace :delayed_job do
     args << "--prefix=#{fetch(:delayed_job_prefix)}" unless fetch(:delayed_job_prefix).nil?
     args << "--pid-dir=#{fetch(:delayed_job_pid_dir)}" unless fetch(:delayed_job_pid_dir).nil?
     args << "--log-dir=#{fetch(:delayed_log_dir)}" unless fetch(:delayed_log_dir).nil?
-    unless fetch(:delayed_job_pools).nil?
+    if fetch(:delayed_job_pools_per_server, nil)
+      server = capture(:hostname)
+      args << fetch(:delayed_job_pools_per_server, {})[server].map {|k,v| "--pool='#{k}:#{v}'" }.join(' ')
+    elsif fetch(:delayed_job_pools, nil)
       args << fetch(:delayed_job_pools, {}).map {|k,v| "--pool='#{k}:#{v}'" }.join(' ')
     end
     args.join(' ')
@@ -63,19 +66,22 @@ namespace :delayed_job do
 
   desc 'Restart the delayed_job process'
   task :restart do
-    if fetch(:delayed_job_default_hooks)
-      on roles(delayed_job_roles) do
-        within release_path do
-          with rails_env: fetch(:rails_env) do
-            execute :bundle, :exec, delayed_job_bin, delayed_job_args, :restart
-          end
+    on roles(delayed_job_roles) do
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :bundle, :exec, delayed_job_bin, delayed_job_args, :restart
         end
       end
     end
   end
 
+  desc 'Default task - conditionally restart'
+  task :default do
+    invoke 'delayed_job:restart' if fetch(:delayed_job_default_hooks, true)
+  end
+
   if Rake::Task.task_defined?('deploy:published')
-    after 'deploy:published', 'delayed_job:restart'
+    after 'deploy:published', 'delayed_job:default'
   end
 end
 
@@ -84,6 +90,7 @@ namespace :load do
     set :delayed_job_workers, 1
     set :delayed_job_queues, nil
     set :delayed_job_pools, nil
+    set :delayed_job_pools_per_server, nil
     set :delayed_job_roles, :app
     set :delayed_job_bin_path, 'bin'
     set :delayed_job_monitor, nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-delayed-job
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Rob Biedenharn
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Adds support for delayed_jobs to Capistrano 3.x