barbeque 2.7.0 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949153219659c19f98869b298ea0b4ec9e549755e43eb2619832ec79aeeeb9c0
-  data.tar.gz: c2fd7f5004b1ff880f416ad7a8b0a0ca632777c0c126276fd14b39db3a7f64f9
+  metadata.gz: cc93ea9aa2da95d53cb020fddedded8cb3c7b142acd7486dfbd3c02df6359629
+  data.tar.gz: 97bebc3bf997c25394383cb9809d6d272e4232dbe6175a7dd4f3f33912e471c8
 SHA512:
-  metadata.gz: bab2ab1ff1bd5f93f26a7bbef69941e365818b110c81344d74db2c55e46bc4e11830a969f7ce0fd0dfce32f746abe6e65fb7ad314f4c8757ac5af8f8bd411004
-  data.tar.gz: cf87d8a77788493e25d65378615f30e93ad7475b7389061be0bb32ba2ea643c54d8a1db3959422fc39a6ea02cc71fa688e6c18ea429553912f4410215f786a74
+  metadata.gz: 616b2ebb11c1e98207fa3ff808db098eb85d0939463b244f3b06ea67980a1adc3c6673382033bdfc727280c34ed752981b8b8d6746735ec46ec5b4d1e9c07c4c
+  data.tar.gz: 583d2f978de033d27223548032c7f39ad89a858fb418d17102474e1404a1895437d508c7c1762dbe6b56a4bdba1ea30afca74145d1c865ba68888034d5b0ff23

data/app/controllers/barbeque/job_definitions_controller.rb

@@ -98,6 +98,7 @@ class Barbeque::JobDefinitionsController < Barbeque::ApplicationController
       :app_id,
       :description,
       slack_notification_attributes: slack_notification_params,
+      retry_config_attributes: retry_config_params,
     )
   end
 end

data/app/views/barbeque/job_definitions/show.html.haml

@@ -100,12 +100,12 @@
                           Retry
           .row
             .col-xs-4
-              = link_to url_for(request.query_parameters.merge(page: @job_executions.prev_page)),
+              = link_to path_to_prev_page(@job_executions),
                 class: "btn btn-default btn-sm btn-block #{'disabled' unless @job_executions.prev_page}" do
                 %i.fa.fa-angle-left
                 New
             .col-xs-4.col-xs-offset-4
-              = link_to url_for(request.query_parameters.merge(page: @job_executions.next_page)),
+              = link_to path_to_next_page(@job_executions),
                 class: "btn btn-default btn-sm btn-block #{'disabled' unless @job_executions.next_page}" do
                 Old
                 %i.fa.fa-angle-right

data/app/views/barbeque/job_executions/show.html.haml

@@ -47,7 +47,8 @@
               %th Message
               %td
                 - if @log
-                  %code= @log['message']
+                  %pre
+                    %code= @log['message']
                 - else
                   Log was not found.
   .col-sm-5

data/app/views/barbeque/job_retries/show.html.haml

@@ -45,7 +45,8 @@
               %th Message
               %td
                 - if @execution_log
-                  %code= @execution_log['message']
+                  %pre
+                    %code= @execution_log['message']
                 - else
                   Execution log was not found.
 

data/db/migrate/20191029105530_change_job_name_to_case_sensitive.rb

@@ -0,0 +1,9 @@
+class ChangeJobNameToCaseSensitive < ActiveRecord::Migration[5.2]
+  def up
+    change_column :barbeque_job_definitions, :job, :string, collation: 'utf8mb4_bin'
+  end
+
+  def down
+    change_column :barbeque_job_definitions, :job, :string, collation: nil
+  end
+end

data/lib/barbeque/message_handler/job_execution.rb

@@ -52,6 +52,9 @@ module Barbeque
           end
         end
       rescue ActiveRecord::RecordNotUnique => e
+        # There's a case where Barbeque receives message which was already received or deleted.
+        # https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/standard-queues.html
+        @message_queue.delete_message(@message)
         raise DuplicatedExecution.new(e.message)
       end
     end

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.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.5
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -425,6 +425,7 @@ files:
 - db/migrate/20190221050714_create_barbeque_retry_configs.rb
 - db/migrate/20190311034445_add_notify_failure_only_if_retry_limit_reached_to_barbeque_slack_notifications.rb
 - db/migrate/20190315052951_change_barbeque_retry_configs_base_delay_default_value.rb
+- db/migrate/20191029105530_change_job_name_to_case_sensitive.rb
 - lib/barbeque.rb
 - lib/barbeque/config.rb
 - lib/barbeque/docker_image.rb