barbeque 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1105e3657e2e78f7555e3dc24ae47b6e36cb06a7c27b79fa7e4072b4966dd320
-  data.tar.gz: 0f303b227dc439a7568ce0b6ab3950762502fde4f64b41b2da3355850fe6e9e8
+  metadata.gz: febc8fb62981217cb94e9614ebe9c303045555802bb010890ff796ae94024996
+  data.tar.gz: 10953be24a7344776dfee42281a7de2004b6abbfefb10b8b994f26fc4a6b8ec6
 SHA512:
-  metadata.gz: 4c2c98729c4162d3e75e0b4e5dd3f8975b25a773bd2de8f759b84df4cebfc0b506005a59e9fea7687979648976ec3172e9b6cfaa9bfc2258816b526e55c9d5dd
-  data.tar.gz: bea63fbf797baffac96a8bc70df54300a647ea0e795c99983c24263ccf551f3b169987567624e7975f422707ca13c08a6b32ec25742e4e12a36756243d199a1c
+  metadata.gz: 30d5b1f6ca098e0c932cf27266b30e2f24c50a08de8475c53fa8cc3d480b06e58ccb30a6aa26df7bc3e5672196f2f91f6f2ead8815ce27f1fca23402ea04d259
+  data.tar.gz: bdd41760b5cc5e1f04e24bd2ca3626d7b71839a381c308ccc3477579e35a12e175177e4772ab3f992187bb2e7ec73e270a4a09f1daeedf1c5080801b86c41857

data/README.md

@@ -1,4 +1,4 @@
-# Barbeque [![Build Status](https://travis-ci.org/cookpad/barbeque.svg?branch=master)](https://travis-ci.org/cookpad/barbeque)
+# Barbeque [![Build Status](https://github.com/cookpad/barbeque/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cookpad/barbeque/actions/workflows/ci.yml)
 
 Job queue system to run job with Docker
 

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/lib/barbeque/message/base.rb

@@ -5,6 +5,7 @@ module Barbeque
       attr_reader :id             # [String] Barbeque::JobExecution is associated via `message_id`
       attr_reader :receipt_handle # [String] Used to ack a message
       attr_reader :type           # [String] "JobExecution", "JobRetry", etc
+      attr_reader :sent_timestamp # [String] The time the message was sent to the queue (epoch time in milliseconds)
 
       # @param [Aws::SQS::Types::Message] raw_message
       # @param message_body [Hash] parse result of `raw_message.body`
@@ -12,6 +13,7 @@ module Barbeque
         assign_body(message_body)
         @id             = raw_message.message_id
         @receipt_handle = raw_message.receipt_handle
+        @sent_timestamp = raw_message.attributes['SentTimestamp']
       end
 
       # To distinguish with `Barbeque::Message::InvalidMessage`

data/lib/barbeque/message_handler/job_execution.rb

@@ -34,6 +34,7 @@ module Barbeque
           'BARBEQUE_MESSAGE_ID'  => @message.id,
           'BARBEQUE_QUEUE_NAME'  => @message_queue.job_queue.name,
           'BARBEQUE_RETRY_COUNT' => '0',
+          'BARBEQUE_SENT_TIMESTAMP' => @message.sent_timestamp,
         }
       end
 
@@ -52,6 +53,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/message_handler/job_retry.rb

@@ -45,6 +45,7 @@ module Barbeque
           'BARBEQUE_MESSAGE_ID'  => @message.retry_message_id,
           'BARBEQUE_QUEUE_NAME'  => @message_queue.job_queue.name,
           'BARBEQUE_RETRY_COUNT' => job_execution.job_retries.count.to_s,
+          'BARBEQUE_SENT_TIMESTAMP' => @message.sent_timestamp,
         }
       end
 

data/lib/barbeque/message_queue.rb

@@ -48,6 +48,7 @@ module Barbeque
         queue_url: @job_queue.queue_url,
         wait_time_seconds: Barbeque.config.sqs_receive_message_wait_time,
         max_number_of_messages: 1,
+        attribute_names: ['SentTimestamp'],
       )
       if result.messages[0]
         Barbeque::Message.parse(result.messages[0])

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.7.2'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2021-12-23 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
@@ -461,7 +461,7 @@ homepage: https://github.com/cookpad/barbeque
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -476,8 +476,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Job queue system to run job with Docker
 test_files: []