capistrano-sidekiq 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edb38405222576fce492b0c77a9c6ba2dee7bb6
-  data.tar.gz: 0ea1fe8a36a8566d03d26cc68be5dcb7406825cc
+  metadata.gz: a62b2fe9026955663fd38cbd5172cea2ffaa187d
+  data.tar.gz: 5bcf7e35d0415ca7387399d6ffc232cf7315c1ed
 SHA512:
-  metadata.gz: b94ffa22a4abc9e36fc48a86d444d8ac5eb4d3d3d39df9180392ca67b6619eb3856a04a1761cea1a3f59b9afa76844f907620ab6bc69f071b902a45baa12561f
-  data.tar.gz: c260577d4f458bb56d2d7a9142cde377bc1bde20d744cd0b91a21a397d56f483ae15cc0eb492723c96d8bbfa596dc47ac3a446e307850fad7d168ffc54965e8b
+  metadata.gz: ec165a6a831d201137aad666c710f1ff086fb00617d9278c079253d23f5930e434bf4addb8be3833f9f6b7a613f74ff038c96d5c6d1a35dc6682918e3ae7a348
+  data.tar.gz: 58ed4ce25f611099bfbd33a8ef0516ac1ffc826505c6a57819aa91cd57876af7244300a52f6a9c60b55b68d415491f8e4cb4e610870dd1c1cb922f9ebf6ad35c

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.7:
+        * fix capistrano2 task @tribble
+        * Run Sidekiq as daemon from Monit @dpaluy
 - 0.3.5: Added :sidekiq_tag for capistrano2 @OscarBarrett
 - 0.3.4: fix bug in sidekiq:start for capistrano 2 task
 - 0.3.3: sidekiq:restart after deploy:restart added to default hooks

data/lib/capistrano/sidekiq/version.rb

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

data/lib/capistrano/tasks/capistrano2.rb

@@ -40,7 +40,7 @@ Capistrano::Configuration.instance.load do
     end
 
     def stop_process(pid_file, idx)
-      run "if [ -d #{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} stop #{pid_file} #{fetch :sidekiq_timeout} ; else echo 'Sidekiq is not running'; fi"
+      run "if [ -d #{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} stop #{pid_file} #{fetch :sidekiq_timeout} ; else echo 'Sidekiq is not running' && if [ -f #{pid_file} ] ; then rm #{pid_file} ; fi ; fi"
     end
 
     def start_process(pid_file, idx)

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

@@ -2,7 +2,7 @@
 <% 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 %>'" with timeout 30 seconds
+  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
   group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
 

metadata

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