magic_recipes_two 0.0.44 → 0.0.45

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODEzMzEyNGE5YjE0YzIwMTRiODE4ZTRjZmZhZDQ5ZDJlYWMzNGJlZg==
+    ZDg5ZTY0YzMzMGY2MTBiZTE3OTc0NzZhYzI1OTcxNTdkMjNhYzdjNw==
   data.tar.gz: !binary |-
-    NmMwMjIxZGQ0NmNiY2U4YTlkOWE1Nzc0NTc2Y2RiODUyYmM5MTYzZQ==
+    MGFkYjFmOWQ1MzhmNTU3YTliMTgzODI4NjU1MmIyMTU5NDM3NDQ4Mw==
 SHA512:
   metadata.gz: !binary |-
-    NTNhNGQwNTdmMDIwMWRkMGMxYjM4ZWEwZGYwY2JkOGY1MjM0YWJkY2IxZDQ3
-    OTQ3ZDAzOTc1NmEwZTcwZmVhYjg3ZTRlYzJlODRkNDNhMzk0N2RkM2NkMTQw
-    NmU4OTVmMmQyMmJmNmNhYTM0ODRkNDI4NzI4MmQzM2JjMTJhODE=
+    MzAxMDkzODdmMTllNGMwMGY0M2Q0ZDM1YjdmMTFjMzYzYTFiYzNkMDE2MWIz
+    OTM0ZTE0M2U3OTM4MDY3ZTU3ODMwMjRjYWQzMjNjMzM4NDBhYTBiOTdhMzBk
+    MTdhYTFmM2U5NDI5NjhhODEwZDNmMTk0OTBiYTkxZDk4N2VlNzM=
   data.tar.gz: !binary |-
-    ODMzNGM4ODUwYjhlODVhY2RjYWQ3YTMzYWUxOGVhMTFhZjFkNzczYmUzODMx
-    N2JlYTI0ZDAwZDFlZDUxZWQ1ZGM5MjE4YzVlODU1ZGZjYWYzZWE0ZDlhOGM2
-    OThjZTUxYzA3MzQyNjI5OTliNGQ4NzI2NGJlNzYwZGUzM2E4NDI=
+    YzcyOWZmZDIzZWZmZTZjYzM0ZDc3MDdmMzNkNzE3MzQwY2ZlYjM5NGE4NzNm
+    MWVmZDg1OThjY2NiYmI2M2JjYzMyM2ZhZGVlNTc0NGVmODgzMGU2MzliZjY4
+    NGQwMzlmYjYwNjg1ZGQ0MTljNjJkMDE0Mjc0MTAyNDIwYjQ0NDY=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.44"
+    VERSION = "0.0.45"
   end
 end

data/lib/capistrano/tasks/sidekiq.rake

@@ -3,12 +3,23 @@ namespace :load do
   task :defaults do
     set :sidekiq_default_hooks, -> { true }
 
-    set :sidekiq_pid, -> { File.join(shared_path, 'pids', 'sidekiq.pid') }
-    set :sidekiq_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-    set :sidekiq_log, -> { File.join(shared_path, 'log', 'sidekiq.log') }
-    set :sidekiq_timeout, -> { 10 }
-    set :sidekiq_roles, -> { :app }
-    set :sidekiq_processes, -> { 1 }
+    set :sidekiq_pid,               -> { File.join(shared_path, 'pids', 'sidekiq.pid') }
+    set :sidekiq_env,               -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set :sidekiq_log,               -> { File.join(shared_path, 'log', 'sidekiq.log') }
+    set :sidekiq_timeout,           -> { 10 }
+    set :sidekiq_roles,             -> { :app }
+    set :sidekiq_processes,         -> { 1 }
+    # Sidekiq queued processes:
+    
+    set :sidekiq_special_queues,    -> { false }
+    set :sidekiq_queued_processes,  -> { [] }
+    ## If needed you can set special queues and configure it seperately
+    ## .. options:  
+    ##    - queue:      string    # => queue-name       (default: "default")
+    ##    - processes:  integer   # => number processes (default: 1)
+    ##    - worker:     integer   # => concurrency      (default: 7)
+    ## => [ { queue: "queue_name", processes: "count", worker: "count" }]
+    
     # 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))
@@ -36,14 +47,39 @@ namespace :sidekiq do
       end
     end
   end
+  
+  def sidekiq_special_config(idx)
+    if fetch(:sidekiq_special_queues)
+      settingz = []
+      fetch(:sidekiq_queued_processes).each do |that|
+        (that[:processes].present? ? that[:processes] : 1 ).to_i.times do
+          settingz.push {   queue: that[:queue].present? ? that[:queue] : "default", 
+                            concurrency: that[:worker].present? ? that[:worker].to_i : 7   }
+        end
+      end
+      settingz[ idx.to_i ]
+    else
+      {}
+    end
+  end
 
   def processes_pids
     pids = []
-    fetch(:sidekiq_processes).times do |idx|
-      pids.push (idx.zero? && fetch(:sidekiq_processes) <= 1) ?
-                    fetch(:sidekiq_pid) :
-                    fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
+    if fetch(:sidekiq_special_queues)
+      processes_count = fetch(:sidekiq_queued_processes).sum{ |qp| qp[:processes].present? ? qp[:processes].to_i : 1 }
+      processes_count.times do |idx|
+        pids.push (idx.zero? && processes_count <= 1) ?
+                      fetch(:sidekiq_pid) :
+                      fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
 
+      end
+    else
+      fetch(:sidekiq_processes).times do |idx|
+        pids.push (idx.zero? && fetch(:sidekiq_processes) <= 1) ?
+                      fetch(:sidekiq_pid) :
+                      fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
+
+      end
     end
     pids
   end
@@ -89,11 +125,17 @@ namespace :sidekiq do
     args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
     args.push "--require #{fetch(:sidekiq_require)}" if fetch(:sidekiq_require)
     args.push "--tag #{fetch(:sidekiq_tag)}" if fetch(:sidekiq_tag)
-    Array(fetch(:sidekiq_queue)).each do |queue|
-      args.push "--queue #{queue}"
+    if fetch(:sidekiq_special_queues)
+      queue_config = sidekiq_special_config(idx)
+      args.push "--queue #{ queue_config[:queue] || 'default' }"
+      args.push "--concurrency #{ queue_config[:concurrency] || 7 }"
+    else
+      Array(fetch(:sidekiq_queue)).each do |queue|
+        args.push "--queue #{queue}"
+      end
+      args.push "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
     end
     args.push "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
-    args.push "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
     # use sidekiq_options for special options
     args.push fetch(:sidekiq_options) if fetch(:sidekiq_options)
 

data/lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb

@@ -8,11 +8,19 @@
   args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)                     
   args.push "--require #{fetch(:sidekiq_require)}" if fetch(:sidekiq_require)             
   args.push "--tag #{fetch(:sidekiq_tag)}" if fetch(:sidekiq_tag)                         
-  Array(fetch(:sidekiq_queue)).each do |queue|                                            
-    args.push "--queue #{queue}"                                                          
-  end                                                                                     
-  args.push "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)                
-  args.push "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency) 
+  
+  if fetch(:sidekiq_special_queues)
+    queue_config = sidekiq_special_config(idx)
+    args.push "--queue #{ queue_config[:queue] || 'default' }"
+    args.push "--concurrency #{ queue_config[:concurrency] || 7 }"
+  else
+    Array(fetch(:sidekiq_queue)).each do |queue|
+      args.push "--queue #{queue}"
+    end
+    args.push "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
+  end
+  args.push "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
+  
   # use sidekiq_options for special options                                               
   args.push fetch(:sidekiq_options) if fetch(:sidekiq_options)                            
   args.push '--daemon'                                                                    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails