barbeque 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e3f6682077d8c2aa1dc329ece9276955d0f4e8
-  data.tar.gz: 5ce55e6f5c4b800749d13f203156ecbc76fc69e8
+  metadata.gz: 0cdb95733c48465dc1ded4986b0bbe415b84df84
+  data.tar.gz: ff6688e7c2b6afabd31a7df9a4d0fd9fe70fd573
 SHA512:
-  metadata.gz: bf76c8ddc5d475c9361b1113b54cf02aa4220842e7577d00a37215a09493ad70473a43ce9aaf5d53db534958a47c6481f7e5e71001d70fd1d7181413c13f619b
-  data.tar.gz: 2d83bb3f0a506d8294ff1b3f32d66210332ea9b7ee3a4c1322ef2a1702e9d86f716f41a3c22dd4db419b0549f0788ded1f1459273e1d0fe1859f2c1643087e84
+  metadata.gz: f7e3e84c1bc9a946d0906150c605835d3a9d42a2608a81859cb735275cd4a6b8586d233c05e3bef692b79589a97949c152fa6996ce5de0c545230b9f81bc8465
+  data.tar.gz: 4e36ad0423d6713a879b875e72e24a0b8f3a8bd6bcdc230cfdc42bd7758bd62f611d9c96846e3e4de501079bffbb241a8988e6cb94130b25bf6a3b19bb7e98f4

data/lib/barbeque/message_handler/job_execution.rb

@@ -14,7 +14,6 @@ module Barbeque
 
       def run
         job_execution = create_job_execution
-        @message_queue.delete_message(@message)
 
         begin
           Executor.create.start_execution(job_execution, job_envs)
@@ -49,6 +48,7 @@ module Barbeque
         Barbeque::JobExecution.transaction do
           Barbeque::JobExecution.create(message_id: @message.id, job_definition: job_definition, job_queue: @message_queue.job_queue).tap do |job_execution|
             Barbeque::ExecutionLog.save_message(job_execution, @message)
+            @message_queue.delete_message(@message)
           end
         end
       rescue ActiveRecord::RecordNotUnique => e

data/lib/barbeque/message_handler/job_retry.rb

@@ -15,12 +15,7 @@ module Barbeque
       end
 
       def run
-        begin
-          job_retry = Barbeque::JobRetry.create(message_id: @message.id, job_execution: job_execution)
-        rescue ActiveRecord::RecordNotUnique => e
-          raise DuplicatedExecution.new(e.message)
-        end
-        @message_queue.delete_message(@message)
+        job_retry = create_job_retry
 
         begin
           Executor.create.start_retry(job_retry, job_envs)
@@ -52,6 +47,16 @@ module Barbeque
           'BARBEQUE_RETRY_COUNT' => job_execution.job_retries.count.to_s,
         }
       end
+
+      def create_job_retry
+        Barbeque::JobRetry.transaction do
+          Barbeque::JobRetry.create(message_id: @message.id, job_execution: job_execution).tap do
+            @message_queue.delete_message(@message)
+          end
+        end
+      rescue ActiveRecord::RecordNotUnique => e
+        raise DuplicatedExecution.new(e.message)
+      end
     end
   end
 end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails