asyncapi-server 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98465ac054db6133b48db7f710198054c7c60b60
-  data.tar.gz: 0036e1102a9f42cd9c8b5e50bcef8113232874a6
+  metadata.gz: 6474a23ea2a71357536415e3f47a521631f7dfd6
+  data.tar.gz: f2dd84f467e36bb75be0e1d050ee1ce89c813c5f
 SHA512:
-  metadata.gz: 43e185eccae647e7b8db9f76731aa9d0f531b773e43340fd395485443b29f55684dfca7b2333d317819f885f246300159c83c3d73413052bb50742ed9d457dba
-  data.tar.gz: 812bb5f496deb99e2934d0e70fe49ecbe76b5d807d902e4ac058675a4523715133efd28f0f02137bc79ffe0de1049ca37e75450793d521b6a7f2e2466ff33fd1
+  metadata.gz: a96efc749932659c6f8e192b083a2c6bbe14b97de47bfe08ec2eb59512a8f3a4776267ebe659a4672c4c3411d50256142f391f1b4500a0b9e0aca10283393480
+  data.tar.gz: 1fa06b7a02572ad9722a7f7212bb9c3743dc1a5a88c8a3dcdcedc8b18a3091ee103ddde8ca5d42c72b4c482da06edc22d9c5cb867788dfbf773457190046eed2

data/app/workers/asyncapi/server/job_worker.rb

@@ -3,8 +3,9 @@ module Asyncapi::Server
 
     include Sidekiq::Worker
     sidekiq_options retry: false
+    MAX_RETRIES = 2
 
-    def perform(job_id)
+    def perform(job_id, retries=0)
       job = Job.find(job_id)
       runner_class = job.class_name.constantize
 
@@ -15,8 +16,19 @@ module Asyncapi::Server
       job_message = [e.message, e.backtrace].flatten.join("\n")
       raise e
     ensure
-      job.update_attributes(status: job_status)
-      report_job_status(job, job_message)
+      if job
+        job.update_attributes(status: job_status)
+        report_job_status(job, job_message)
+      else
+        # For some reason "ActiveRecord::Base.after_transaction",
+        # ":after_commit" and ":after_create" does not prevent
+        # the ActiveRecord-Sidekiq race condition. In order to
+        # prevent this just retry running JobWorker until it finds
+        # the job by job_id.
+        if retries <= MAX_RETRIES
+          JobWorker.perform_async(job_id, retries+1)
+        end
+      end
     end
 
     private

data/lib/asyncapi/server/version.rb

@@ -1,5 +1,5 @@
 module Asyncapi
   module Server
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/spec/workers/job_worker_spec.rb

@@ -74,8 +74,14 @@ module Asyncapi
             expect(job.status).to eq "error"
           end
         end
-      end
 
+        context "job is nil" do
+          it "retries JobWorker" do
+            expect(JobWorker).to receive(:perform_async).with("999", 1).and_return true
+            expect { described_class.new.perform("999") }.to raise_error
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asyncapi-server
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Asynchronous API communication - Server