barbeque 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949153219659c19f98869b298ea0b4ec9e549755e43eb2619832ec79aeeeb9c0
-  data.tar.gz: c2fd7f5004b1ff880f416ad7a8b0a0ca632777c0c126276fd14b39db3a7f64f9
+  metadata.gz: d60b8430e415373bfed2cc0863621d82417996114abacde3ff0574c9480cd895
+  data.tar.gz: d074c73ed7aa5970bb36412c6240a593dae056b08744a22498186312f99a0f8a
 SHA512:
-  metadata.gz: bab2ab1ff1bd5f93f26a7bbef69941e365818b110c81344d74db2c55e46bc4e11830a969f7ce0fd0dfce32f746abe6e65fb7ad314f4c8757ac5af8f8bd411004
-  data.tar.gz: cf87d8a77788493e25d65378615f30e93ad7475b7389061be0bb32ba2ea643c54d8a1db3959422fc39a6ea02cc71fa688e6c18ea429553912f4410215f786a74
+  metadata.gz: 3a26e7eed029255d7ca049bf981b5c34bd1fca38279b0201ad6c58329a4512626258c7c510cf0f4aa103a70496c1d06e700a960eede1c5daf6514bb634a79db0
+  data.tar.gz: 1fa3d72da18e34591feec9051f0c30006b1a09fff12395d9986b182aff3a7d30ace369005e8e17638eb3fbeb457ff6ca64bb002dde02568dd95ff91c5eff34d5

data/lib/barbeque/runner.rb

@@ -43,7 +43,7 @@ module Barbeque
       end
 
       loop do
-        current_num = @job_queue.job_executions.where(status: [:running, :retried]).count
+        current_num = @job_queue.job_executions.where(status: :running).count + Barbeque::JobRetry.where(status: :running).joins(job_execution: :job_queue).merge(Barbeque::JobQueue.where(id: @job_queue.id)).count
         if current_num < max_num
           return
         end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails