capistrano-sidekiq 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad138283f25fb8e7f052e76ebe99b729b97b6fe
-  data.tar.gz: f9ac72309d9b3973170be0510fe23e44e355b3a7
+  metadata.gz: d2ebff45a008112b37488d76601d42fc3d67db51
+  data.tar.gz: b21609915d9495d21118f3753b2c7f8c186cd593
 SHA512:
-  metadata.gz: f6b45f749f552181926bb83c1e43c4ce811cd922a55585f438725621255e2263a22be1bf666d60db14d08788094761cf09cd2ed5d078c39ada24b1675c9229e2
-  data.tar.gz: c4a9082ac21c841d0b1c0d9a83d831846542ea3bdb77587003ffc1fa8c5525a6194d2e86a71873d8d356fe99a1d41f586874cd212548417f4a90114c3d7b1411
+  metadata.gz: 7fbb2f111b44e8a5033672c6b897594ea11dc4680107916ba0bab660ff8571ef466ba9f1f45002613b80655594ebc14cfbbefe21136f1847ac954f48b2968c8f
+  data.tar.gz: 3747089f60d984ff613e00d1f8f34e208b38a0b56117043ec6a390de2ea641d013db804fb13bebe24670f874c6432a466846b4dd0ff70663c513e81a4cded7b1

data/README.md

@@ -32,7 +32,7 @@ Configurable options, shown here with defaults:
     :sidekiq_pid =>  File.join(shared_path, 'tmp', 'pids', 'sidekiq.pid')
     :sidekiq_env =>  fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
     :sidekiq_log =>  File.join(shared_path, 'log', 'sidekiq.log')
-    :sidekiq_options =>  "-e #{fetch(:sidekiq_env)} -L #{fetch(:sidekiq_log)}"
+    :sidekiq_options =>  nil
     :sidekiq_timeout =>  10
     :sidekiq_role =>  :app
     :sidekiq_processes =>  1

data/lib/capistrano/sidekiq.rb

@@ -1,4 +1,4 @@
-if Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
+if Gem::Specification::find_by_name('capistrano').version >= Gem::Version.new('3.0.0')
   load File.expand_path('../tasks/sidekiq.cap', __FILE__)
 else
   require_relative 'tasks/capistrano2'

data/lib/capistrano/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Sidekiq
-    VERSION = '0.0.2'
+    VERSION = '0.1.1'
   end
 end

data/lib/capistrano/tasks/sidekiq.cap

@@ -5,9 +5,6 @@ namespace :load do
     set :sidekiq_pid, -> { File.join(shared_path, 'tmp', '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_options, -> { nil }
-
     set :sidekiq_timeout, -> { 10 }
     set :sidekiq_role, -> { :app }
     set :sidekiq_processes, -> { 1 }
@@ -25,17 +22,47 @@ namespace :deploy do
 end
 
 namespace :sidekiq do
-  def for_each_process(&block)
-    fetch(:sidekiq_processes).times do |idx|
-      pid_file = if idx.zero? && fetch(:sidekiq_processes) <= 1
-        fetch(:sidekiq_pid)
-      else
-        fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
-      end
+  def for_each_process(reverse=false, &block)
+    pids = processes_pids
+    pids.reverse! if reverse
+    pids.each_with_index do |pid_file, idx|
       yield(pid_file, idx)
     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")
+
+    end
+    pids
+  end
+
+  def stop_sidekiq(pid_file)
+    execute :bundle, :exec, :sidekiqctl, 'stop', "#{pid_file}", fetch(:sidekiq_timeout)
+  end
+
+  def start_sidekiq(pid_file, idx = 0)
+    args = []
+    args.push "--index #{idx}"
+    args.push "--pidfile #{pid_file}"
+    args.push "--environment #{fetch(:sidekiq_env)}"
+    args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
+    args.push fetch(:sidekiq_options)
+
+    if defined?(JRUBY_VERSION)
+      args.push ">/dev/null 2>&1 &"
+      warn 'Since JRuby doesn\'t support Process.daemon, Sidekiq will not be running as a daemon.'
+    else
+      args.push "--daemon"
+    end
+
+    execute :bundle, :exec, :sidekiq, args.compact.join(' ')
+  end
+
   task :add_default_hooks do
     after 'deploy:starting', 'sidekiq:quiet'
     after 'deploy:updated', 'sidekiq:stop'
@@ -46,7 +73,7 @@ namespace :sidekiq do
   desc 'Quiet sidekiq (stop processing new tasks)'
   task :quiet do
     on roles fetch(:sidekiq_role) do
-      for_each_process do |pid_file, idx|
+      for_each_process(true) do |pid_file, idx|
         if test("[ -f #{pid_file} ]") and test("kill -0 $( cat #{pid_file} )")
           within current_path do
             execute :bundle, :exec, :sidekiqctl, 'quiet', "#{pid_file}"
@@ -59,10 +86,10 @@ namespace :sidekiq do
   desc 'Stop sidekiq'
   task :stop do
     on roles fetch(:sidekiq_role) do
-      for_each_process do |pid_file, idx|
+      for_each_process(true) do |pid_file, idx|
         if test("[ -f #{pid_file} ]") and test("kill -0 $( cat #{pid_file} )")
           within current_path do
-            execute :bundle, :exec, :sidekiqctl, 'stop', "#{pid_file}", fetch(:sidekiq_timeout)
+            stop_sidekiq(pid_file)
           end
         end
       end
@@ -74,21 +101,7 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_role) do
       within current_path do
         for_each_process do |pid_file, idx|
-          args = []
-          args.push "--index #{idx}"
-          args.push "--pidfile #{pid_file}"
-          args.push "--environment #{fetch(:sidekiq_env)}"
-          args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
-          args.push fetch(:sidekiq_options)
-
-          if defined?(JRUBY_VERSION)
-            args.push ">/dev/null 2>&1 &"
-            warn 'Since JRuby doesn\'t support Process.daemon, Sidekiq will not be running as a daemon.'
-          else
-            args.push "--daemon"
-          end
-
-          execute :bundle, :exec, :sidekiq, args.compact.join(' ')          
+          start_sidekiq(pid_file)
         end
       end
     end
@@ -100,4 +113,30 @@ namespace :sidekiq do
     invoke 'sidekiq:start'
   end
 
+  #delete any pid file not in use
+  task :cleanup do
+    on roles fetch(:sidekiq_role) do
+      for_each_process do |pid_file, idx|
+        if test("[ -f #{pid_file} ]")
+          execute "rm #{pid_file}" unless test("kill -0 $( cat #{pid_file} )")
+        end
+      end
+    end
+  end
+
+  #TODO : Don't start if all proccess are off, raise warning.
+  desc 'Respawn missing sidekiq proccesses'
+  task :respawn do
+    invoke 'sidekiq:cleanup'
+    on roles fetch(:sidekiq_role) do
+      within current_path do
+        for_each_process do |pid_file, idx|
+          unless test("[ -f #{pid_file} ]")
+            start_sidekiq(pid_file, idx)
+          end
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano