makandra_sidekiq 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a031fd7e128b55c5af83a18fd3c66b1bce4253a71506d3d7d6e5ea863ede57
-  data.tar.gz: 797ec99395f49ab6099288054b407a8b2b7f277539037662aaae9329bc13ce24
+  metadata.gz: fe216cf3996745151d6aefc183425d692e334999110947a7c1cc2114cbe4b57e
+  data.tar.gz: 575bb317450b8c419706c06a62c86d541e3ef2a5657de35e354f165b48d89c6b
 SHA512:
-  metadata.gz: 9cb9832fe0e4c3ab143abcd544bd76b30dda4d916f35ce2536e2f4f7158c10dfbd9988ddfdd49be1750fa616966f284cfc58c1326b6411381b5efd11a77860a4
-  data.tar.gz: 13881f0bd8099f15bcf8c838b256d33e0f5b7dd7542696f696f1a6cc973ca2517fa8b42a796d152fcdc2c1941453caed35be51613914377963692c99e729cca7
+  metadata.gz: 44225769a2c6ad71c57c820ec519da9edd7cd912e95d5679727384aa73d287142244657ae1f1bd3fe160963f8e2a5ad001ef73bb2a436bb8da62c6e21c6275ac
+  data.tar.gz: 307dbf80b79f73374c464c32184fbe80fbde6d4d3a34b3ecce420c2281f031228472c9ca4cfa6e2340538f0b6a2b3158c92bbdd176f6a190d4465cac6381ce13

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.6.5

data/.travis.yml

@@ -1,12 +1,10 @@
 sudo: false
 language: ruby
+dist: trusty
 rvm:
   - 2.3.3
 script: bundle exec rspec spec
 cache: bundler
-notifications:
-  email:
-    - fail@makandra.de
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,20 +1,30 @@
-# makandra_sidekiq change log
-
+# Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.1.3][] (2017-02-13)
+This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+## Unreleased
+
+### Compatible changes
+- CHANGELOG to satisfy [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) format
 
-Gem no longer depends on `capistrano`, since using its Capistrano recipes is optional.
+## 0.1.3 2017-02-13
 
-## [0.1.2][] (2017-01-12)
+### Changed
+- Gem no longer depends on `capistrano`, since using its Capistrano recipes is optional.
 
-`sidekiq:start` checks that sidekiq really comes up and will retry a few times.
+## 0.1.2 2017-01-12
 
-## [0.1.1][] (2016-09-29)
+### Added
+- `sidekiq:start` checks that sidekiq really comes up and will retry a few times.
 
-Do not fail on first deploy.
+## 0.1.1 2016-09-29
 
+### Fixed
+- Do not fail on first deploy.
 
-## [0.1.0][] (2016-09-29)
+## 0.1.0] 2016-09-29
 
-Initial release.
+### Added
+- Initial release.

data/Gemfile.lock

@@ -1,13 +1,19 @@
 PATH
   remote: .
   specs:
-    makandra_sidekiq (0.1.4)
+    makandra_sidekiq (0.1.5)
+      sidekiq (< 6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    rack (2.0.7)
+    rack-protection (2.0.7)
+      rack
     rake (10.5.0)
+    redis (4.1.3)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -21,6 +27,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    sidekiq (5.2.7)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (>= 1.5.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
 
 PLATFORMS
   ruby
@@ -32,4 +43,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/lib/makandra_sidekiq/sidekiq_control.rb

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'sidekiq'
 require 'pathname'
 require 'yaml'
 require 'open3'
@@ -17,7 +18,7 @@ module MakandraSidekiq
     def quiet
       if running?
         puts 'Preventing Sidekiq from accepting new jobs...'
-        run_sidekiqctl('quiet')
+        sidekiqctl_quiet
       else
         puts 'Sidekiq is not running.'
       end
@@ -26,7 +27,7 @@ module MakandraSidekiq
     def stop
       if running?
         puts 'Stopping Sidekiq...'
-        run_sidekiqctl('stop')
+        sidekiqctl_stop
       else
         puts 'Sidekiq is not running.'
       end
@@ -56,6 +57,11 @@ module MakandraSidekiq
       @pid_file ||= @root.join(@config[:pidfile])
     end
 
+    # The shutdown timeout for Sidekiq
+    def timeout
+      @timeout ||= @config[:timeout] || Sidekiq::DEFAULTS[:timeout]
+    end
+
     def read_pid
       if pid_file.file?
         pid_file.read.to_i
@@ -94,8 +100,16 @@ module MakandraSidekiq
       config
     end
 
-    def run_sidekiqctl(command)
-      bundle_exec('sidekiqctl', command, pid_file.to_s)
+    def sidekiqctl_quiet
+      bundle_exec 'sidekiqctl', 'quiet', pid_file
+    end
+
+    def sidekiqctl_stop
+      # The "hard kill after" timeout for sidekiqctl. Adding a few seconds to be
+      # sure that jobs running at shutdown are requeued by Sidekiq.
+      safe_timeout = timeout + 2 # seconds
+
+      bundle_exec 'sidekiqctl', 'stop', pid_file, safe_timeout
     end
 
     def patiently_start_sidekiq
@@ -151,7 +165,8 @@ module MakandraSidekiq
     end
 
     def bundle_exec(*command)
-      stdout_str, stderr_str, status = Bundler.with_clean_env { Open3.capture3('bundle', 'exec', *command, chdir: @root.to_s) }
+      string_command = command.map(&:to_s)
+      stdout_str, stderr_str, status = Bundler.with_clean_env { Open3.capture3('bundle', 'exec', *string_command, chdir: @root.to_s) }
       puts stdout_str
       unless status.success?
         fail "#{command} failed with message: #{stderr_str}"

data/lib/makandra_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module MakandraSidekiq
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/makandra_sidekiq.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "sidekiq", "< 6"
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: makandra_sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Support code for sidekiq, including rake tasks and capistrano recipes.