capistrano-sidekiq 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62b2fe9026955663fd38cbd5172cea2ffaa187d
-  data.tar.gz: 5bcf7e35d0415ca7387399d6ffc232cf7315c1ed
+  metadata.gz: 5dd1c2e79b129bc931e93fda45f0a71e40d7915e
+  data.tar.gz: 1681fdc2903aa89986f1c36d62b23ddfbfa0bb9b
 SHA512:
-  metadata.gz: ec165a6a831d201137aad666c710f1ff086fb00617d9278c079253d23f5930e434bf4addb8be3833f9f6b7a613f74ff038c96d5c6d1a35dc6682918e3ae7a348
-  data.tar.gz: 58ed4ce25f611099bfbd33a8ef0516ac1ffc826505c6a57819aa91cd57876af7244300a52f6a9c60b55b68d415491f8e4cb4e610870dd1c1cb922f9ebf6ad35c
+  metadata.gz: c2b565dd956c2d410123847b1dfca4b87653ec18e64507518ed001008a739fa8060b38253d13f95239c068c6c867d2c21df75a132fe674eccd906fe3e8937cce
+  data.tar.gz: f7f3311f90b68b9d996e5051d8f3a4d3921b49f2036099da1eeea071a3b74a8175c8686842168078a44ff02494666f36ae033f0baf89880efb757ab479f0d441

data/README.md

@@ -54,6 +54,9 @@ There is a know bug that prevent sidekiq from starting when pty is true
 set :pty,  false
 ```
 ## Changelog
+- 0.3.8:
+        * Update monit template: use su instead of sudo / permit all Sidekiq options @bensie
+        * Unmonitor monit while deploy @Saicheg
 - 0.3.7:
         * fix capistrano2 task @tribble
         * Run Sidekiq as daemon from Monit @dpaluy

data/lib/capistrano/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Sidekiq
-    VERSION = '0.3.7'
+    VERSION = '0.3.8'
   end
 end

data/lib/capistrano/tasks/monit.cap

@@ -2,12 +2,26 @@ namespace :load do
   task :defaults do
     set :sidekiq_monit_conf_dir, -> { '/etc/monit/conf.d' }
     set :monit_bin, -> { '/usr/bin/monit' }
+    set :sidekiq_monit_default_hooks, -> { true }
   end
 end
 
+namespace :deploy do
+  before :starting, :check_sidekiq_monit_hooks do
+    if fetch(:sidekiq_default_hooks) && fetch(:sidekiq_monit_default_hooks)
+      invoke 'sidekiq:monit:add_default_hooks'
+    end
+  end
+end
 
 namespace :sidekiq do
   namespace :monit do
+
+    task :add_default_hooks do
+      after 'deploy:check',       'sidekiq:monit:unmonitor'
+      after  'deploy:publishing', 'sidekiq:monit:monitor'
+    end
+
     desc 'Config Sidekiq monit-service'
     task :config do
       on roles(fetch(:sidekiq_role)) do |role|
@@ -63,7 +77,31 @@ namespace :sidekiq do
     end
 
     def sidekiq_service_name(index=nil)
-      fetch(:sidekiq_service_name, "sidekiq_#{fetch(:application)}") + index.to_s
+      fetch(:sidekiq_service_name, "sidekiq_#{fetch(:application)}_#{fetch(:sidekiq_env)}") + index.to_s
+    end
+
+    def sidekiq_config
+      if fetch(:sidekiq_config)
+        "--config #{fetch(:sidekiq_config)}"
+      end
+    end
+
+    def sidekiq_concurrency
+      if fetch(:sidekiq_concurrency)
+        "--concurrency #{fetch(:sidekiq_concurrency)}"
+      end
+    end
+
+    def sidekiq_queues
+      Array(fetch(:sidekiq_queue)).map do |queue|
+        "--queue #{queue}"
+      end.join(' ')
+    end
+
+    def sidekiq_logfile
+      if fetch(:sidekiq_log)
+        "--logfile #{fetch(:sidekiq_log)}"
+      end
     end
 
   end

data/lib/capistrano/templates/sidekiq_monit.conf.erb

@@ -2,8 +2,9 @@
 <% processes_pids.each_with_index do |pid_file, idx| %>
 check process <%= sidekiq_service_name(idx) %>
   with pidfile "<%= pid_file %>"
-  start program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq <% if fetch(:sidekiq_config) %> -C <%= fetch(:sidekiq_config) %> <% end %> -P <%= pid_file %>' -d" with timeout 30 seconds
-  stop program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiqctl stop <%= pid_file %>'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
+  start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq  <%= sidekiq_config %> --index <%= idx %> --pidfile <%= pid_file %> --environment <%= fetch(:sidekiq_env) %> <%= sidekiq_concurrency %> <%= sidekiq_logfile %> <%= sidekiq_queues %>'" with timeout 30 seconds
+
+  stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiqctl stop <%= pid_file %>'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
   group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
 
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano