capistrano-sidekiq 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd1c2e79b129bc931e93fda45f0a71e40d7915e
-  data.tar.gz: 1681fdc2903aa89986f1c36d62b23ddfbfa0bb9b
+  metadata.gz: 7f252aeda1b342db98d4e78c48a596f62a08854b
+  data.tar.gz: c8b03baafafcee0e6dc3ee5299a15684f8752c7e
 SHA512:
-  metadata.gz: c2b565dd956c2d410123847b1dfca4b87653ec18e64507518ed001008a739fa8060b38253d13f95239c068c6c867d2c21df75a132fe674eccd906fe3e8937cce
-  data.tar.gz: f7f3311f90b68b9d996e5051d8f3a4d3921b49f2036099da1eeea071a3b74a8175c8686842168078a44ff02494666f36ae033f0baf89880efb757ab479f0d441
+  metadata.gz: ee796988057a1bb571c48366007131c778f70dbc20f0e2d64b7660e17144584d32a403f0a914aa4ead634d5b5d0f7fe3227d9aabb8decae26f229a723afc5f82
+  data.tar.gz: 94d89cd024d5fc60cdccd529bf8bc2195c4bf8bbf654204d2117e1147ded1e63d1a4111df9a504aca771161419e11965cb5dac7279277b3e84d214a27d194124

data/README.md

@@ -49,11 +49,12 @@ Configurable options, shown here with defaults:
     :sidekiqctl_cmd => "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" # Only for capistrano2.5
 ```
 
-There is a know bug that prevent sidekiq from starting when pty is true
+There is a known bug that prevents sidekiq from starting when pty is true
 ```ruby
 set :pty,  false
 ```
 ## Changelog
+- 0.3.9: Restore daemon flag from Monit template
 - 0.3.8:
         * Update monit template: use su instead of sudo / permit all Sidekiq options @bensie
         * Unmonitor monit while deploy @Saicheg

data/lib/capistrano/sidekiq/version.rb

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

data/lib/capistrano/tasks/capistrano2.rb

@@ -59,7 +59,7 @@ Capistrano::Configuration.instance.load do
         args.push '--daemon'
       end
 
-      run "if [ -d #{current_path} ] && [ ! -f #{pid_file} ]; then cd #{current_path} ; #{fetch(:sidekiq_cmd)} #{args.compact.join(' ')} ; else echo 'Sidekiq is already running'; fi", pty: false
+      run "if [ -d #{current_path} ] && [ ! -f #{pid_file} ] || ! kill -0 `cat #{pid_file}` > /dev/null 2>&1; then cd #{current_path} ; #{fetch(:sidekiq_cmd)} #{args.compact.join(' ')} ; else echo 'Sidekiq is already running'; fi", pty: false
     end
 
     desc 'Quiet sidekiq (stop accepting new work)'

data/lib/capistrano/tasks/monit.cap

@@ -49,7 +49,7 @@ namespace :sidekiq do
       end
     end
 
-    desc 'Disable Sidekiq monit-service'
+    desc 'Start Sidekiq monit-service'
     task :start do
       on roles(fetch(:sidekiq_role)) do
         fetch(:sidekiq_processes).times do |idx|
@@ -58,7 +58,7 @@ namespace :sidekiq do
       end
     end
 
-    desc 'Disable Sidekiq monit-service'
+    desc 'Stop Sidekiq monit-service'
     task :stop do
       on roles(fetch(:sidekiq_role)) do
         fetch(:sidekiq_processes).times do |idx|
@@ -67,7 +67,7 @@ namespace :sidekiq do
       end
     end
 
-    desc 'Disable Sidekiq monit-service'
+    desc 'Restart Sidekiq monit-service'
     task :restart do
       on roles(fetch(:sidekiq_role)) do
         fetch(:sidekiq_processes).times do |idx|

data/lib/capistrano/tasks/sidekiq.cap

@@ -29,7 +29,7 @@ namespace :sidekiq do
     pids = processes_pids
     pids.reverse! if reverse
     pids.each_with_index do |pid_file, idx|
-      within current_path do
+      within release_path do
         yield(pid_file, idx)
       end
     end
@@ -119,7 +119,7 @@ namespace :sidekiq do
   desc 'Quiet sidekiq (stop processing new tasks)'
   task :quiet do
     on roles fetch(:sidekiq_role) do
-      if test("[ -d #{current_path} ]") # fixes #11
+      if test("[ -d #{release_path} ]") # fixes #11
         for_each_process(true) do |pid_file, idx|
           if pid_process_exists?(pid_file)
             quiet_sidekiq(pid_file)
@@ -132,7 +132,7 @@ namespace :sidekiq do
   desc 'Stop sidekiq'
   task :stop do
     on roles fetch(:sidekiq_role) do
-      if test("[ -d #{current_path} ]")
+      if test("[ -d #{release_path} ]")
         for_each_process(true) do |pid_file, idx|
           if pid_process_exists?(pid_file)
             stop_sidekiq(pid_file)

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 = "/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
+  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 %> -d'" 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sidekiq integration for Capistrano