sidekiq-status 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6af99e65af49f5719a28a8f7a1f6b1149d9d9b03
-  data.tar.gz: b200404a99e2c1211b17a5c799ada01f6c43223a
+SHA256:
+  metadata.gz: ac470dbfaa9bdccc0ef97b932f5b3dd713001063c6b22617a72976564a740901
+  data.tar.gz: 7e0bf255bce4f090a9238892185486aec556949ffb629d5879758e8302e38cd0
 SHA512:
-  metadata.gz: 5014ce48d74a1098c36ba54f1865e53d3a36dd8577c9a6998ed122b0f2067655804e8b237e6bb30e73b701745b01746669ae1fe5325e01f842af1377a96d56e8
-  data.tar.gz: 6db554a3e954c57fa1dae71289a76e9961f6f13338e7485c271c9fc5646aa9075e9d8cbc27eb595dfccc9394e4a0d2d31af87423efa7bb79e1eb232b0dddb9ea
+  metadata.gz: cd389c60190a3cfd9b4b31c382ef6f564b62dba8a2bcdec201451d06c53ecad7f653e141aa663600ddd614bb68b5fb2a888ecd47b58660db2d5b381bb90ef438
+  data.tar.gz: c2b36634db5c27605d82c0120048f76e90c0597d0a66b1b79dbf9529250ae0b6bab06b4ea8cc145053a23046560d1bdc2e05c335bc5c9474b6adc18192a821dc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**Version 1.0.2**
++ Fixes status not being set to `:failed` after retries
+
 **Version 1.0.1**
 + Fixes namespacing in `sidekiq-status/testing/inline`
 

data/lib/sidekiq-status/server_middleware.rb

@@ -57,8 +57,7 @@ module Sidekiq::Status
     rescue Exception
       status = :failed
       if msg['retry']
-        retry_count = msg['retry_count'] || 0
-        if retry_count < retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
+        if retry_attempt_number(msg) < retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
           status = :retrying
         end
       end
@@ -68,9 +67,21 @@ module Sidekiq::Status
 
     private
 
+    def retry_attempt_number(msg)
+      if msg['retry_count']
+        msg['retry_count'] + sidekiq_version_dependent_retry_offset
+      else
+        0
+      end
+    end
+
     def retry_attempts_from(msg_retry, default)
       msg_retry.is_a?(Integer) ? msg_retry : default
     end
+
+    def sidekiq_version_dependent_retry_offset
+      Sidekiq.major_version >= 4 ? 1 : 0
+    end
   end
 
   # Helper method to easily configure sidekiq-status server middleware

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/lib/sidekiq-status_spec.rb

@@ -8,6 +8,7 @@ describe Sidekiq::Status do
   let!(:unused_id) { SecureRandom.hex(12) }
   let!(:plain_sidekiq_job_id) { SecureRandom.hex(12) }
   let!(:retried_job_id) { SecureRandom.hex(12) }
+  let!(:retry_and_fail_job_id) { SecureRandom.hex(12) }
 
   describe ".status, .working?, .complete?" do
     it "gets job status by id as symbol" do
@@ -174,6 +175,28 @@ describe Sidekiq::Status do
       end
     end
 
+    it "marks retried jobs as failed once they do eventually fail" do
+      allow(SecureRandom).to receive(:hex).and_return(retry_and_fail_job_id)
+      start_server do
+        expect(
+          capture_status_updates(3) {
+            expect(RetryAndFailJob.perform_async).to eq(retry_and_fail_job_id)
+          }
+        ).to eq([retry_and_fail_job_id] * 3)
+
+        expect(Sidekiq::Status.status(retry_and_fail_job_id)).to eq(:retrying)
+      end
+
+      # restarting and waiting for the job to fail
+      start_server do
+        expect(capture_status_updates(3) {}).to eq([retry_and_fail_job_id] * 3)
+
+        expect(Sidekiq::Status.status(retry_and_fail_job_id)).to eq(:failed)
+        expect(Sidekiq::Status.failed?(retry_and_fail_job_id)).to be_truthy
+        expect(Sidekiq::Status::retrying?(retry_and_fail_job_id)).to be_falsey
+      end
+    end
+
     context ":expiration param" do
       before { seed_secure_random_with_job_ids }
       let(:expiration_param) { Sidekiq::Status::DEFAULT_EXPIRY * 100 }

data/spec/spec_helper.rb

@@ -35,7 +35,7 @@ def redis_thread messages_limit, *channels
     messages = []
     Sidekiq.redis do |conn|
       puts "Subscribing to #{channels} for #{messages_limit.to_s.bold} messages".cyan if ENV['DEBUG']
-      conn.subscribe_with_timeout 30, *channels do |on|
+      conn.subscribe_with_timeout 60, *channels do |on|
         on.subscribe do |ch, subscriptions|
           puts "Subscribed to #{ch}".cyan if ENV['DEBUG']
           if subscriptions == channels.size

data/spec/support/test_jobs.rb

@@ -62,6 +62,14 @@ class FailingJob < StubJob
   end
 end
 
+class RetryAndFailJob < StubJob
+  sidekiq_options retry: 1
+
+  def perform
+    raise StandardError
+  end
+end
+
 class FailingHardJob < StubJob
   def perform
     raise Exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Evgeniy Tsvigun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs