magic_recipes_two 0.0.49 → 0.0.50

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTAxNWQ1MDA5ZGFhODc4YzhmZThjZTQ0MWY4N2MwOTVmYTZiZGNmOQ==
+    NjAxZGM5ZmFiZTVkMDhmZDUyOTIzYTcxMDBmZWZjNTU3NDVhYzYwNA==
   data.tar.gz: !binary |-
-    YWRmNmM3YTVhZjZkMWNlMjc0ZGRkMzI2ZDliOGZiOWQyYWUxY2NlMw==
+    ODFhZTE0NTAzMTA3MDcyM2ZkYjRmNzk3YmVjN2NjZDRjMTgzNmMxYw==
 SHA512:
   metadata.gz: !binary |-
-    OWNkYmI0MzBmMjBjNjljZTQwZGRlMGQ2MjQxZDRkMzE3OTJiMWExZmI5ZTE5
-    OWUxOTkzMmQxZjUwYmYxOWY1ODkxZTMyNjFlZjc0MjU0NjFkZDlkZmE3ZGIx
-    NjBlZmY1MDczMGRjOTI0NDJlNGIxMTA3ZGIxODVlMjE4Y2Y4MWI=
+    NjZlY2U4MzgxYzAzMmU0MzY0MTEwODk3NmFlOGJiNjVlNWI5YWY4MDRhZjVh
+    ZTcxYjk3ZDY2MmRmM2JmNWJhMTQxNWUwN2M3Njk3ZGM1NDI0MDc5MmU2ZDkx
+    MmJkZTY3NDA1OWE1MzA1NDUyYjRlOWVjYjA5NWFjZjdkODIzYzM=
   data.tar.gz: !binary |-
-    NzE5ZGY2NjRjZTJhMTc5OGU5MzFmNWI0ZjBlZjUwZGViZDc3YWFmOGU3ZmIw
-    Y2FkNDRmNGFlYWYzYTQ4ZmZlZGE0NTk5NGIzOGY1ZDI3NTU2ZGU5ODAzYmYz
-    Y2IyMjQyZTc4NTJlOTVlNDkyZGZmZGYyZTgxZDQzZmFiNWUzMDU=
+    N2NiOTA4ZjYyMjc1ZWNhNzQ0Y2U5ODRhNjkxODFiMjBjZjA3YzNmMjlkOTll
+    YTkwMTI4NTYwYjQ3OWQ2NDI2ZjcxZGY1YmJlM2FhNDVkZmUxNTRjMzQ0YjBl
+    NWM1NDUwYTRiMmU3YzA3ODhkYTEzMGVkZGQ2NzE4ZTJiYWQ4ZGE=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.49"
+    VERSION = "0.0.50"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -84,7 +84,8 @@ namespace :monit do
           if Array(fetch(:monit_processes)).include?(process)
             on roles(fetch("#{process}_roles".to_sym)) do
               if process == "sidekiq"
-                fetch(:sidekiq_processes).times do |idx|
+                # fetch(:sidekiq_processes)
+                sidekiq_processes_count.times do |idx|
                   sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
                 end
               elsif process == "thin"

data/lib/capistrano/tasks/sidekiq.rake

@@ -77,7 +77,7 @@ namespace :sidekiq do
 
       end
     else
-      fetch(:sidekiq_processes).times do |idx|
+      fetch(:sidekiq_processes).to_i.times do |idx|
         pids.push (idx.zero? && fetch(:sidekiq_processes) <= 1) ?
                       fetch(:sidekiq_pid) :
                       fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
@@ -86,6 +86,14 @@ namespace :sidekiq do
     end
     pids
   end
+  
+  def sidekiq_processes_count
+    if fetch(:sidekiq_special_queues)
+      fetch(:sidekiq_queued_processes).inject(0){ |sum,qp| sum + (qp[:processes] && qp[:processes].to_i > 0 ? qp[:processes].to_i : 1) }
+    else
+      fetch(:sidekiq_processes).to_i
+    end
+  end
 
   def pid_process_exists?(pid_file)
     pid_file_exists?(pid_file) and test(*("kill -0 $( cat #{pid_file} )").split(' '))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails