barbeque 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e5ddccef50d8012d519620dec44f063f85f29b399bc6eb4a9a540b4df31821
-  data.tar.gz: 7a05fba8fd639bd69c6f9dacb95cfe2d4304ff18723f13eda6d6dc7a8f8e09f9
+  metadata.gz: 8a27e1555a662fc67cff6d20504bff8e7649f761c4c7500e14f8200347a822ee
+  data.tar.gz: 535818478a8701f4c1e00f9600328b9e0e2d6c7ccd45ca16e3851319ac8a4676
 SHA512:
-  metadata.gz: 826610de1fa826d2478307188ffd96ad7f7a73d039556261cf07998ece853c9b68cd95ed8ed7f3034f519d63d69674b5aa3fbfef65a08cd3d179bb21e0fc8992
-  data.tar.gz: 14aba5a62e4a4150463de75a357641012eddcb964c889b5820eabd42c95f0caec971298473d5b7b1977989c1297898b53b5bc602b9c015a22b217f2220d7e2d5
+  metadata.gz: 768ca47dc94d8479804de1a4c9ddbb3f989732eddbb9c8eb2bbc9778503c076d965929a8a5990e663209ea78e87ca61a62cbd874f2d42876018ba339f15031a9
+  data.tar.gz: d916df13c88917745c35e1e32c09b1e0c5d2ad1c2801abee8ec35ec2004d07f9048d1372bdf182652e89966c0249608bf2dabc7d0389d9eecac8708aa78cbcf3

data/app/models/barbeque/job_queue.rb

@@ -2,6 +2,7 @@ class Barbeque::JobQueue < Barbeque::ApplicationRecord
   SQS_NAME_PREFIX = ENV['BARBEQUE_SQS_NAME_PREFIX'] || 'Barbeque-'
   SQS_NAME_MAX_LENGTH = 80
 
+  has_many :job_executions, dependent: :destroy
   has_many :sns_subscriptions, class_name: 'SNSSubscription', dependent: :destroy
 
   # SQS queue allows [a-zA-Z0-9_-]+ as queue name. Its maximum length is 80.

data/lib/barbeque/execution_poller.rb

@@ -1,13 +1,15 @@
 require 'barbeque/exception_handler'
+require 'barbeque/executor'
 
 module Barbeque
   class ExecutionPoller
-    def initialize
+    def initialize(job_queue)
+      @job_queue      = job_queue
       @stop_requested = false
     end
 
     def run
-      Barbeque::JobExecution.running.find_in_batches do |job_executions|
+      @job_queue.job_executions.running.find_in_batches do |job_executions|
         job_executions.shuffle.each do |job_execution|
           if @stop_requested
             return

data/lib/barbeque/message_queue.rb

@@ -6,8 +6,8 @@ module Barbeque
   class MessageQueue
     attr_reader :job_queue
 
-    def initialize(queue_name)
-      @job_queue = Barbeque::JobQueue.find_by!(name: queue_name)
+    def initialize(job_queue)
+      @job_queue = job_queue
       @messages  = []
       @stop      = false
     end

data/lib/barbeque/retry_poller.rb

@@ -1,11 +1,19 @@
+require 'barbeque/exception_handler'
+require 'barbeque/executor'
+
 module Barbeque
   class RetryPoller
-    def initialize
+    def initialize(job_queue)
+      @job_queue      = job_queue
       @stop_requested = false
     end
 
     def run
-      Barbeque::JobRetry.running.find_in_batches do |job_retries|
+      Barbeque::JobRetry
+        .joins(:job_execution)
+        .running
+        .merge(Barbeque::JobExecution.where(job_queue: @job_queue))
+        .find_in_batches do |job_retries|
         job_retries.shuffle.each do |job_retry|
           if @stop_requested
             return

data/lib/barbeque/runner.rb

@@ -10,10 +10,8 @@ module Barbeque
   # it to message handler.
 
   class Runner
-    DEFAULT_QUEUE = 'default'
-
-    def initialize(queue_name: ENV['BARBEQUE_QUEUE'] || DEFAULT_QUEUE)
-      @queue_name = queue_name
+    def initialize(job_queue)
+      @job_queue = job_queue
     end
 
     def run
@@ -34,7 +32,7 @@ module Barbeque
     private
 
     def message_queue
-      @message_queue ||= MessageQueue.new(@queue_name)
+      @message_queue ||= MessageQueue.new(@job_queue)
     end
 
     def keep_maximum_concurrent_executions
@@ -45,7 +43,7 @@ module Barbeque
       end
 
       loop do
-        current_num = Barbeque::JobExecution.where(status: [:running, :retried]).count
+        current_num = @job_queue.job_executions.where(status: [:running, :retried]).count
         if current_num < max_num
           return
         end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/barbeque/worker.rb

@@ -6,6 +6,8 @@ require 'serverengine'
 
 module Barbeque
   module Worker
+    DEFAULT_QUEUE = ENV['BARBEQUE_DEFAULT_QUEUE'] || 'default'
+
     class UnexpectedMessageType < StandardError; end
 
     def self.run(
@@ -32,14 +34,17 @@ module Barbeque
     end
 
     def initialize
+      queue_name = ENV['BARBEQUE_QUEUE'] || DEFAULT_QUEUE
+      queue      = Barbeque::JobQueue.find_by!(name: queue_name)
+
       @command =
         case worker_id
         when 0
-          ExecutionPoller.new
+          ExecutionPoller.new(queue)
         when 1
-          RetryPoller.new
+          RetryPoller.new(queue)
         else
-          Runner.new
+          Runner.new(queue)
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -470,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker