capistrano3-delayed-job 1.7.2 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 208242ae221650f600d11e49bcef622b4a2f8ff2
-  data.tar.gz: 5a00c1528b2fd8bd1a27ff9bca1674d118a4aafa
+SHA256:
+  metadata.gz: 0752a6724134a2b730dc23b8908e715ea7e28becc3e63014b2a41355d9fc39f4
+  data.tar.gz: 0200a538e00978a37c9c5a88c9cad98485deb05fbddd057f9e0e4f65def9c8e8
 SHA512:
-  metadata.gz: b9641db7e60e0cc30e962ff5541be6930218bca13cf7ba788c52222a20cbd66158480c39365c37a740252d5db087fa1e63e064380fc89e87d974084825d1d124
-  data.tar.gz: 47689dd4119cd20311ce29f1fa76f1663c66a8ed391385c65b1bbfbfb9b0df6ec2f7f6f1441f8df192fecfb4f696aff1cfc4d62fb19b2b7dd4fa566d68feeef3
+  metadata.gz: d55acc6151887e61e09ad8266f1fa3a6bf266100691e8842df6cee2d85dddd0e0426e86147c237f377175abe83bfcf90dd091d2a9de70f65a9f515a72f7c7c78
+  data.tar.gz: 53ebf37ad1879ce6127863874737065576dc524a1dff389851f866e3bb96900f955604331cbc1b92ed0c3892a11ec9329f5334d3f150bd051011b2191dc18b7c

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.
@@ -103,21 +124,39 @@ set :delayed_job_roles, [:app, :background]
 ### Set the location of the delayed_job pid file(s)
 # default value: "#{Rails.root}/tmp/pids" or "#{Dir.pwd}/tmp/pids"
 # set :delayed_job_pid_dir, 'path_to_pid_dir'
+
+### Set the options to be passed along to daemons when starting/stopping/restarting delayed_job workers
+# options supported by daemons can be found at https://github.com/thuehlinger/daemons/blob/master/lib/daemons/cmdline.rb
+# set :delayed_job_daemon_opts, ["no_wait", "shush"]
+```
+
+It also conditionally adds the following hook:
+
+```ruby
+  if Rake::Task.task_defined?('deploy:published')
+    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
 ```
 
-It also adds the following hook
+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
-after 'deploy:published', 'delayed_job:restart' do
-    invoke 'delayed_job:restart'
-end
+set :delayed_job_default_hooks, false
 ```
 
 Following setting is recommended to avoid stop/restart problem.
 See [Issue #16](https://github.com/platanus/capistrano3-delayed-job/issues/16) or [PR #22](https://github.com/platanus/capistrano3-delayed-job/pull/22) for more detail.
 
 ```ruby
-set: linked_dirs, %w(tmp/pids)
+set :linked_dirs, %w(tmp/pids)
 
 # or
 
@@ -139,8 +178,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.2"
+  spec.version       = "1.7.6"
   spec.authors       = ["Rob Biedenharn",
                         "Juan Ignacio Donoso",
                         "Agustin Feuerhake",
@@ -24,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'capistrano', '~> 3.0', '>= 3.0.0'
+  spec.add_dependency 'daemons', '~> 1.3'
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rubocop", "~> 0.0", '>= 0.39.0'
 end

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,9 +12,15 @@ 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
+    unless fetch(:delayed_job_daemon_opts).nil?
+      args << "--daemon-options='--#{fetch(:delayed_job_daemon_opts, []).join(',--')}'"
+    end
     args.join(' ')
   end
 
@@ -72,10 +78,14 @@ namespace :delayed_job do
     end
   end
 
-  after 'deploy:published', 'delayed_job:restart' do
-    invoke 'delayed_job:restart'
+  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:default'
+  end
 end
 
 namespace :load do
@@ -83,8 +93,10 @@ 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
+    set :delayed_job_default_hooks, true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-delayed-job
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.6
 platform: ruby
 authors:
 - Rob Biedenharn
@@ -11,40 +11,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -108,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Adds support for delayed_jobs to Capistrano 3.x