barbeque 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2d835c84a99b3c12b30c45c6b133bd45dee8c0c90c69792e82ce7e31c4f589
-  data.tar.gz: a2d3a604433215188449ea6fb22dcf4f5da73ec833874d9af4abcbd2fd697132
+  metadata.gz: 949153219659c19f98869b298ea0b4ec9e549755e43eb2619832ec79aeeeb9c0
+  data.tar.gz: c2fd7f5004b1ff880f416ad7a8b0a0ca632777c0c126276fd14b39db3a7f64f9
 SHA512:
-  metadata.gz: 5ba6a9de43ffda9cc5fe4dd3f5c4dde4428cc624c999831391e85a15815381957569c8b1953c07719a2444c539e1dd1d8e37cbb1bc687aefa536571df41f661e
-  data.tar.gz: 015b27c099386c2338bee1c9c8ebbc3ad5eea1bce3cb0ab71404808f38ee334b467d011afda2887aa00ed46b1e992cbbfcdae2e55001163ae2570da131f85530
+  metadata.gz: bab2ab1ff1bd5f93f26a7bbef69941e365818b110c81344d74db2c55e46bc4e11830a969f7ce0fd0dfce32f746abe6e65fb7ad314f4c8757ac5af8f8bd411004
+  data.tar.gz: cf87d8a77788493e25d65378615f30e93ad7475b7389061be0bb32ba2ea643c54d8a1db3959422fc39a6ea02cc71fa688e6c18ea429553912f4410215f786a74

data/app/controllers/barbeque/job_definitions_controller.rb

@@ -81,7 +81,7 @@ class Barbeque::JobDefinitionsController < Barbeque::ApplicationController
   private
 
   def slack_notification_params
-    %i[id channel notify_success failure_notification_text _destroy]
+    %i[id channel notify_success notify_failure_only_if_retry_limit_reached failure_notification_text _destroy]
   end
 
   def retry_config_params

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

@@ -25,6 +25,9 @@
         .col-md-8
           = f.check_box :notify_success
           = f.label :notify_success, 'Notify success event to Slack'
+        .col-md-8
+          = f.check_box :notify_failure_only_if_retry_limit_reached
+          = f.label :notify_failure_only_if_retry_limit_reached, 'Notify failure event to Slack only if retry limit reached'
 
       .row
         .col-md-8

data/db/migrate/20190311034445_add_notify_failure_only_if_retry_limit_reached_to_barbeque_slack_notifications.rb

@@ -0,0 +1,5 @@
+class AddNotifyFailureOnlyIfRetryLimitReachedToBarbequeSlackNotifications < ActiveRecord::Migration[5.2]
+  def change
+    add_column :barbeque_slack_notifications, :notify_failure_only_if_retry_limit_reached, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20190315052951_change_barbeque_retry_configs_base_delay_default_value.rb

@@ -0,0 +1,9 @@
+class ChangeBarbequeRetryConfigsBaseDelayDefaultValue < ActiveRecord::Migration[5.2]
+  def up
+    change_column_default :barbeque_retry_configs, :base_delay, 15
+  end
+
+  def down
+    change_column_default :barbeque_retry_configs, :base_delay, 0.3
+  end
+end

data/lib/barbeque/slack_notifier.rb

@@ -13,10 +13,12 @@ module Barbeque
             client.notify_success("*[SUCCESS]* Succeeded to execute #{job_execution_link(job_execution)}")
           end
         elsif job_execution.failed?
-          client.notify_failure(
-            "*[FAILURE]* Failed to execute #{job_execution_link(job_execution)}" \
-            " #{job_execution.slack_notification.failure_notification_text}"
-          )
+          if should_notify_failure?(job_execution)
+            client.notify_failure(
+              "*[FAILURE]* Failed to execute #{job_execution_link(job_execution)}" \
+              " #{job_execution.slack_notification.failure_notification_text}"
+            )
+          end
         else
           client.notify_failure(
             "*[ERROR]* Failed to execute #{job_execution_link(job_execution)}" \
@@ -35,10 +37,12 @@ module Barbeque
             client.notify_success("*[SUCCESS]* Succeeded to retry #{job_retry_link(job_retry)}")
           end
         elsif job_retry.failed?
-          client.notify_failure(
-            "*[FAILURE]* Failed to retry #{job_retry_link(job_retry)}" \
-            " #{job_retry.slack_notification.failure_notification_text}"
-          )
+          if should_notify_failure?(job_retry.job_execution)
+            client.notify_failure(
+              "*[FAILURE]* Failed to retry #{job_retry_link(job_retry)}" \
+              " #{job_retry.slack_notification.failure_notification_text}"
+            )
+          end
         else
           client.notify_failure(
             "*[ERROR]* Failed to retry #{job_retry_link(job_retry)}" \
@@ -68,6 +72,18 @@ module Barbeque
       def job_retry_url(job_retry)
         Barbeque::Engine.routes.url_helpers.job_execution_job_retry_url(job_retry.job_execution, job_retry, host: barbeque_host)
       end
+
+      def should_notify_failure?(job_execution_with_slack_notification)
+        unless job_execution_with_slack_notification.slack_notification.notify_failure_only_if_retry_limit_reached
+          return true
+        end
+
+        unless job_execution_with_slack_notification.job_definition.retry_config
+          return true
+        end
+
+        job_execution_with_slack_notification.job_definition.retry_config.retry_limit <= job_execution_with_slack_notification.job_retries.count
+      end
     end
   end
 end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -423,6 +423,8 @@ files:
 - db/migrate/20170724025542_add_index_to_job_execution_status.rb
 - db/migrate/20180411070937_add_index_to_barbeque_job_executions_created_at.rb
 - 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
 - lib/barbeque.rb
 - lib/barbeque/config.rb
 - lib/barbeque/docker_image.rb
@@ -473,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker