sidekiq-status 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91dc4d7b8b58f85f9f04ea9a2346b64999f453fe186f9dcbaa915bdfa7432920
-  data.tar.gz: f08db1e8246645be8783ac1e8a8fba46cc9e1777ee2049b7bc256ec07ee34454
+  metadata.gz: 852f99075106d76a18f3a0f21a3e49785069af7e8ee479c08959edeeef655439
+  data.tar.gz: 02fb95b39d1e37a081e64b2442a4c9a19b708d44bb52af24c1ccdff4d3a884c7
 SHA512:
-  metadata.gz: 33943d5d8e663ba5ef5c58c692137f5e4cb8977ef15cab4862183cf2a473743da00c4f05837ef3b2e073c7c04c9a4e085ac561ab396c2269f59392bb90328edf
-  data.tar.gz: 73a30ec1c4baafa8e28c45c04cabcc08f8612889a2398f9b7706bbf19b3e204e82d7aef73e1b9cbe91b5c562018ce2ab29bb5738425ad3ebb910f4b8fe62485c
+  metadata.gz: 7091b83f0ae9277478d75e6d5aab3a29936e76d0cb7c9f671031aa357e8fe2b4f1cacb92716fa3b5b2e474bbde3c5c26f8298195154d798f82d0f52a4e0661e7
+  data.tar.gz: 58c13e7c9fa8c1712bfbd47fbcb47a5cd69e0804093def9745de5d591d8dc1959e6701c6baff6efb808d305e7fe4f750859d5575f62b2d28f29484b6e2029f02

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**Version 1.1.4**
+* Ensures jobs without sidekiq-status do not record status exceptions (#150)
+
 **Version 1.1.3**
 * Adds a job status filter to the UI (#149)
 

data/lib/sidekiq-status/server_middleware.rb

@@ -61,7 +61,7 @@ module Sidekiq::Status
           status = :retrying
         end
       end
-      store_status worker.jid, status, expiry
+      store_status(worker.jid, status, expiry) if job_class && job_class.ancestors.include?(Sidekiq::Status::Worker)
       raise
     end
 

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
   end
 end

data/spec/lib/sidekiq-status/server_middleware_spec.rb

@@ -36,21 +36,39 @@ describe Sidekiq::Status::ServerMiddleware do
     it "sets failed status when Exception raised" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
       start_server do
-        expect(capture_status_updates(3) {
-          expect(FailingHardJob.perform_async).to eq(job_id)
-        }).to eq([job_id]*3)
+      expect(capture_status_updates(3) {
+        expect(FailingHardJob.perform_async).to eq(job_id)
+      }).to eq([job_id]*3)
       end
       expect(redis.hget("sidekiq:status:#{job_id}", :status)).to eq('failed')
       expect(Sidekiq::Status::failed?(job_id)).to be_truthy
     end
 
+    context "when Sidekiq::Status::Worker is not included in the job" do
+      it "should not set a failed status" do
+        allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+        start_server do
+          expect(FailingNoStatusJob.perform_async).to eq(job_id)
+        end
+        expect(redis.hget("sidekiq:status:#{job_id}", :status)).to be_nil
+      end
+
+      it "should not set any status when Exception raised" do
+        allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+        start_server do
+          expect(FailingHardNoStatusJob.perform_async).to eq(job_id)
+        end
+        expect(redis.hget("sidekiq:status:#{job_id}", :status)).to be_nil
+      end
+    end
+
     context "sets interrupted status" do
       it "on system exit signal" do
         allow(SecureRandom).to receive(:hex).once.and_return(job_id)
         start_server do
-          expect(capture_status_updates(3) {
-            expect(ExitedJob.perform_async).to eq(job_id)
-          }).to eq([job_id]*3)
+        expect(capture_status_updates(3) {
+          expect(ExitedJob.perform_async).to eq(job_id)
+        }).to eq([job_id]*3)
         end
         expect(redis.hget("sidekiq:status:#{job_id}", :status)).to eq('interrupted')
         expect(Sidekiq::Status::interrupted?(job_id)).to be_truthy

data/spec/support/test_jobs.rb

@@ -10,6 +10,16 @@ class StubJob
   end
 end
 
+class StubNoStatusJob
+  include Sidekiq::Worker
+
+  sidekiq_options 'retry' => false
+
+  def perform(*args)
+  end
+end
+
+
 class ExpiryJob < StubJob
   def expiration
     15
@@ -69,6 +79,12 @@ class FailingJob < StubJob
   end
 end
 
+class FailingNoStatusJob < StubNoStatusJob
+  def perform
+    raise StandardError
+  end
+end
+
 class RetryAndFailJob < StubJob
   sidekiq_options retry: 1
 
@@ -83,6 +99,12 @@ class FailingHardJob < StubJob
   end
 end
 
+class FailingHardNoStatusJob < StubNoStatusJob
+  def perform
+    raise Exception
+  end
+end
+
 class ExitedJob < StubJob
   def perform
     raise SystemExit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Evgeniy Tsvigun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq