barbeque 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b2851abd5afe48390d9cc74057bb8364b354fa
-  data.tar.gz: abd05db89ddd0ca3cdb0561741c9d480c667543c
+  metadata.gz: 97319e09ca3ea34d2026ad845e4ba1d0552939fd
+  data.tar.gz: d97fe80c057637486eb31506976a17eba29a1532
 SHA512:
-  metadata.gz: 353ff01f793a236c9bdaccdfdcf989b294fed731dfe753c81a4e0526cd83e28fda01fff881858dbb0725156cb71e8ee6886942936d13edadc28cf290fe7095cd
-  data.tar.gz: 03d100039d9f126275fd3bf7325d72a0d1a3d68f2bf4511dcd4c230e6c110f1280331f89ac8a3a8d8f74d682b0463e7c05baa7df10bd659d70ffb8718ce4135a
+  metadata.gz: e43368a6ae848bc2a38256f34789d6b8d04a52fcf1c3cea76f2fe5a785171076065aff168d096edce2fc80cf12af8aaa205d24bdbd5b65613772b06f392fd57e
+  data.tar.gz: e663effa9d01a89915e99bc4002f54722d27bc6bce5677228ca732360b78d12b75d8cbe152e2261d5b53bad80c84ffcdc5934f3d143bfb4eeff87554150ceb64

data/app/models/barbeque/job_queue.rb

@@ -13,4 +13,27 @@ class Barbeque::JobQueue < Barbeque::ApplicationRecord
   def sqs_queue_name
     SQS_NAME_PREFIX + name
   end
+
+  # Returns queue URL of given name.
+  # Basically, we should use stored queue URL as the documentation[1] suggests.
+  # But when the Barbeque's database is temporarily unavailable due to
+  # scheduled maintenance, we have to build queue URL without the database. The
+  # maintenance mode is enabled by BARBEQUE_DATABASE_MAINTENANCE and
+  # AWS_ACCOUNT_ID variable.
+  # [1]: http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-queue-message-identifiers.html#sqs-general-identifiers
+  #
+  # @param name [String] queue name in Barbeque
+  # @return [String] queue URL of SQS
+  def self.queue_url_from_name(name)
+    if database_maintenance_mode?
+      "https://sqs.#{ENV.fetch('AWS_REGION')}.amazonaws.com/#{ENV.fetch('AWS_ACCOUNT_ID')}/#{SQS_NAME_PREFIX}#{name}"
+    else
+      select(:queue_url).find_by!(name: name).queue_url
+    end
+  end
+
+  def self.database_maintenance_mode?
+    ENV['BARBEQUE_DATABASE_MAINTENANCE'] == '1' && ENV['AWS_REGION'].present? && ENV['AWS_ACCOUNT_ID'].present?
+  end
+  private_class_method :database_maintenance_mode?
 end

data/app/services/barbeque/message_enqueuing_service.rb

@@ -20,9 +20,9 @@ class Barbeque::MessageEnqueuingService
 
   # @return [String] message_id
   def run
-    queue = Barbeque::JobQueue.find_by!(name: @queue)
+    queue_url = Barbeque::JobQueue.queue_url_from_name(@queue)
     response = Barbeque::MessageEnqueuingService.sqs_client.send_message(
-      queue_url:    queue.queue_url,
+      queue_url:    queue_url,
       message_body: build_message.to_json,
     )
     response.message_id

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails