makandra_sidekiq 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3bfe5006adbe8559a89f1241947631148ede51d
-  data.tar.gz: d013fb95fece584426fa16afd0d9fffc93026594
+  metadata.gz: cdf2b37120431a87cfb6a7033e7cd8b011ceec8f
+  data.tar.gz: a5b3dd8b2a3c7255304bfd0354334026d6d97ac6
 SHA512:
-  metadata.gz: 6da3b0b2929b8791280f114762e011287831904c28751ec57f67c743555de0fb0311b903e2ceb1ae680912656064d34600d54d01920a07d8386c20687cf94421
-  data.tar.gz: 3fabbb010fe20fdefc3a2622c7aa32b002a45cae0aaa25fd4f3fd0cbc93999e75f719ef1fbf31cf9ea8d790b3722b7071502820b472e93c71bc5500404531c7a
+  metadata.gz: b814fd76bcb8ad021a9c401dbeeb60fc3cef1260a70bcf7460f64dcd6596745128f8a25e655381179fb0b5b2a805b271aa5e6ee4894a25256d1591dc9ac10640
+  data.tar.gz: e2ba1646f82d892a275c708f29224d749cce5382b909691154469d3c078535ec496f377d57cf1e1795550c84fa9829858cc27ca4e279350be8931bb898dfc954

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.2][] (2017-01-12)
+
+`sidekiq:start` checks that sidekiq really comes up and will retry a few times.
+
 ## [0.1.1][] (2016-09-29)
 
 Do not fail on first deploy.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makandra_sidekiq (0.1.1)
+    makandra_sidekiq (0.1.2)
       capistrano (>= 3)
 
 GEM

data/lib/makandra_sidekiq/sidekiq_control.rb

@@ -36,14 +36,15 @@ module MakandraSidekiq
         puts 'Sidekiq is already running.'
       else
         puts 'Starting Sidekiq...'
-        run_sidekiq
+        patiently_start_sidekiq
+        puts 'Done.'
       end
     end
 
     private
 
     def rails_env
-      @rails_env ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
     end
 
     def config_path
@@ -54,13 +55,14 @@ module MakandraSidekiq
       @pid_file ||= @root.join(@config[:pidfile])
     end
 
-    def pid
-      @pid ||= if pid_file.file?
+    def read_pid
+      if pid_file.file?
         pid_file.read.to_i
       end
     end
 
     def running?
+      pid = read_pid
       Process.kill(0, pid) if pid
     rescue Errno::ESRCH
       # not running
@@ -95,7 +97,36 @@ module MakandraSidekiq
       bundle_exec('sidekiqctl', command, pid_file.to_s)
     end
 
-    def run_sidekiq
+    def patiently_start_sidekiq
+      remove_pid_file
+      try_times(5, error: "Sidekiq failed to start. Check #{@config[:logfile]}.") do |i|
+        puts "Trying to spawn (attempt #{i})..."
+        spawn_sidekiq
+        try_times(20, error: "Sidekiq did not create a PID file and probably failed to start. Check #{@config[:logfile]}.") do
+          pid_file_present?
+        end
+        sleep 10 # wait for any crashes during startup
+        running?
+      end
+    end
+
+    def remove_pid_file
+      pid_file.delete if pid_file_present?
+    end
+
+    def pid_file_present?
+      pid_file.file?
+    end
+
+    def try_times(count, error:)
+      count.times do |i|
+        return if yield(i + 1)
+        sleep(1)
+      end
+      fail error
+    end
+
+    def spawn_sidekiq
       arguments = [
         '--index', sidekiq_index.to_s,
         '--environment', rails_env,
@@ -113,7 +144,7 @@ module MakandraSidekiq
       stdout_str, stderr_str, status = Open3.capture3('bundle', 'exec', *command, chdir: @root.to_s)
       puts stdout_str
       unless status.success?
-        fail "Sidekiqctl failed with message: #{stderr_str}"
+        fail "#{command} failed with message: #{stderr_str}"
       end
     end
 

data/lib/makandra_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module MakandraSidekiq
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makandra_sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano