Allow custom options per process

ricardokdz · Mar 11, 2015 · 04da503 · 04da503
1 parent 6d16ad6
commit 04da503
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/capistrano/tasks/capistrano2.rb b/lib/capistrano/tasks/capistrano2.rb
@@ -17,6 +17,7 @@
   _cset(:sidekiq_timeout) { 10 }
   _cset(:sidekiq_role) { :app }
   _cset(:sidekiq_processes) { 1 }
+  _cset(:sidekiq_options_per_process) { nil }
 
   if fetch(:sidekiq_default_hooks)
     before 'deploy:update_code', 'sidekiq:quiet'
@@ -56,6 +57,11 @@ def start_process(pid_file, idx)
       fetch(:sidekiq_queue).each do |queue|
         args.push "--queue #{queue}"
       end if fetch(:sidekiq_queue)
+
+      if process_options = fetch(:sidekiq_options_per_process)
+        args.push process_options[idx]
+      end
+
       args.push fetch(:sidekiq_options)
 
       if defined?(JRUBY_VERSION)

diff --git a/lib/capistrano/tasks/sidekiq.cap b/lib/capistrano/tasks/sidekiq.cap
@@ -8,6 +8,7 @@ namespace :load do
     set :sidekiq_timeout, -> { 10 }
     set :sidekiq_role, -> { :app }
     set :sidekiq_processes, -> { 1 }
+    set :sidekiq_options_per_process, -> { nil }
     # Rbenv and RVM integration
     set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(sidekiq sidekiqctl))
     set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(sidekiq sidekiqctl))
@@ -94,6 +95,9 @@ namespace :sidekiq do
     end
     args.push "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
     args.push "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
+    if process_options = fetch(:sidekiq_options_per_process)
+      args.push process_options[idx]
+    end
     # use sidekiq_options for special options
     args.push fetch(:sidekiq_options) if fetch(:sidekiq_options)