barbeque 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a07ec80487438ab32f44b7af709d578cdd3e3a3
-  data.tar.gz: cc0639ff64e3c992e960b454e2e9dab8faf7e6b6
+  metadata.gz: 99c32b91addc8f074b6b5ebef438f279f14180e7
+  data.tar.gz: e8d36e10bb202841c2e8770ee390822276d7f557
 SHA512:
-  metadata.gz: 26042a230e695187cc8bf37c6842189a42909512c22fd5a5bfc328cf22d88257f498532a644973f4dfc788988d65e8aedf29c4f57d15aa8e7ed52356862c6567
-  data.tar.gz: 36e3894bdba8d78175fab0610031e8953086b0ee1f6a538b2b1beeda9b3c1d79da706b0065369a20494a6d4e13ee1fe7cc66fed98bb67cd88885cbff32d1c010
+  metadata.gz: 2ddf10732282032a55500b9c613c9bec72b43f399473d3a8199fd632a015e0c9a8b2eb04eb741d4eb48feae9a19e5b1b82ed9610ba8d6533f11487b986955faf
+  data.tar.gz: 66d16bc796d4534107906cf454eb78a6f83022efcd2a47c9d1dc9ef331a49aa23072f26b59d85c04aee770ad57bfb0478e3dcd1653cf9276b945daa92f854cc6

data/app/controllers/barbeque/job_executions_controller.rb

@@ -7,7 +7,7 @@ class Barbeque::JobExecutionsController < Barbeque::ApplicationController
 
   def retry
     @job_execution = Barbeque::JobExecution.find(params[:job_execution_id])
-    raise ActionController::BadRequest unless @job_execution.failed?
+    raise ActionController::BadRequest unless @job_execution.retryable?
 
     result = Barbeque::MessageRetryingService.new(message_id: @job_execution.message_id).run
     @job_execution.retried!

data/app/helpers/barbeque/job_executions_helper.rb

@@ -10,6 +10,8 @@ module Barbeque::JobExecutionsHelper
         'warning'
       when 'pending'
         'info'
+      when 'error'
+        'danger'
       else
         'default'
       end

data/app/models/barbeque/job_execution.rb

@@ -10,6 +10,7 @@ class Barbeque::JobExecution < Barbeque::ApplicationRecord
     success: 1,
     failed:  2,
     retried: 3,
+    error: 4,
   }
 
   paginates_per 15
@@ -18,4 +19,8 @@ class Barbeque::JobExecution < Barbeque::ApplicationRecord
   def execution_log
     @execution_log ||= Barbeque::ExecutionLog.load(execution: self)
   end
+
+  def retryable?
+    failed? || error?
+  end
 end

data/app/models/barbeque/job_retry.rb

@@ -9,6 +9,7 @@ class Barbeque::JobRetry < Barbeque::ApplicationRecord
     success: 1,
     failed:  2,
     retried: 3,
+    error: 4,
   }
 
   # @return [Hash] - A hash created by `JobExecutor::Retry#log_result`

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

@@ -65,7 +65,7 @@
                       = link_to job_execution_path(job_execution), class: 'btn btn-default btn-sm btn-flat' do
                         %i.fa.fa-chevron-right
                         Details
-                      - if job_execution.failed?
+                      - if job_execution.retryable?
                         = link_to job_execution_retry_path(job_execution), method: :post, class: 'btn btn-default btn-sm btn-flat',
                           data: { disable_with: 'retrying...', confirm: "Are you sure to retry #{@job_definition.job} ##{job_execution.id}?" } do
                           %i.fa.fa-refresh

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

@@ -8,7 +8,7 @@
               \##{@job_execution.id} of
               = link_to @job_execution.job_definition do
                 #{@job_execution.job_definition.job}
-          - if @job_execution.failed?
+          - if @job_execution.retryable?
             .col-md-2
               = link_to job_execution_retry_path(@job_execution), method: :post, class: 'btn btn-default btn-block pull-right',
                 data: { disable_with: 'retrying...', confirm: "Are you sure to retry #{@job_execution.job_definition.job} ##{@job_execution.id}?" } do

data/lib/barbeque/message_handler/job_execution.rb

@@ -20,9 +20,15 @@ module Barbeque
           raise DuplicatedExecution.new(e.message)
         end
 
-        stdout, stderr, status = run_command
+        begin
+          stdout, stderr, status = run_command
+        rescue Exception => e
+          job_execution.update!(status: :error, finished_at: Time.now)
+          notify_slack(job_execution)
+          raise e
+        end
         job_execution.update!(status: status.success? ? :success : :failed, finished_at: Time.now)
-        notify_slack(job_execution, status)
+        notify_slack(job_execution)
 
         log_result(job_execution, stdout, stderr)
       end
@@ -34,19 +40,24 @@ module Barbeque
         Barbeque::ExecutionLog.save(execution: execution, log: log)
       end
 
-      def notify_slack(job_execution, status)
+      def notify_slack(job_execution)
         return if job_execution.slack_notification.nil?
 
         client = Barbeque::SlackClient.new(job_execution.slack_notification.channel)
-        if status.success?
+        if job_execution.success?
           if job_execution.slack_notification.notify_success
             client.notify_success("*[SUCCESS]* Succeeded to execute #{job_execution_link(job_execution)}")
           end
-        else
+        elsif job_execution.failed?
           client.notify_failure(
             "*[FAILURE]* Failed to execute #{job_execution_link(job_execution)}" \
             " #{job_execution.slack_notification.failure_notification_text}"
           )
+        else
+          client.notify_failure(
+            "*[ERROR]* Failed to execute #{job_execution_link(job_execution)}" \
+            " #{job_execution.slack_notification.failure_notification_text}"
+          )
         end
       end
 

data/lib/barbeque/message_handler/job_retry.rb

@@ -23,11 +23,18 @@ module Barbeque
         end
         job_execution.update!(status: 'retried')
 
-        stdout, stderr, result = run_command
+        begin
+          stdout, stderr, result = run_command
+        rescue Exception => e
+          job_retry.update!(status: :error, finished_at: Time.now)
+          job_execution.update!(status: :error)
+          notify_slack(job_retry)
+          raise e
+        end
         status = result.success? ? :success : :failed
         job_retry.update!(status: status, finished_at: Time.now)
         job_execution.update!(status: status)
-        notify_slack(job_retry, result)
+        notify_slack(job_retry)
 
         log_result(job_retry, stdout, stderr)
       end
@@ -40,20 +47,24 @@ module Barbeque
       end
 
       # @param [Barbeque::JobRetry] job_retry
-      # @param [Process::Status] result
-      def notify_slack(job_retry, result)
+      def notify_slack(job_retry)
         return if job_retry.slack_notification.nil?
 
         client = Barbeque::SlackClient.new(job_retry.slack_notification.channel)
-        if result.success?
+        if job_retry.success?
           if job_retry.slack_notification.notify_success
             client.notify_success("*[SUCCESS]* Succeeded to retry #{job_retry_link(job_retry)}")
           end
-        else
+        elsif job_retry.failed?
           client.notify_failure(
             "*[FAILURE]* Failed to retry #{job_retry_link(job_retry)}" \
             " #{job_execution.slack_notification.failure_notification_text}"
           )
+        else
+          client.notify_failure(
+            "*[ERROR]* Failed to retry #{job_retry_link(job_retry)}" \
+            " #{job_execution.slack_notification.failure_notification_text}"
+          )
         end
       end
 

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails