barbeque 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40cf0144aba9f752b9dcbe2bd9f7cc44c7c67a5
-  data.tar.gz: e62cc25ffe4149198edc0bf1112ec3a7393da534
+  metadata.gz: 0a2d49fbe13b55d7fbcc1b00150bc61f2345136c
+  data.tar.gz: 6af129b187c7367753e9474bfe484bcedca466a4
 SHA512:
-  metadata.gz: 661b4b161c357fe7b2ebc16923c6c643e597dbe060d6395fad78af6981c0f66fa12c84581ac795833985b2c54f13c5e038f088c36719d62ebdc710035fd02441
-  data.tar.gz: d57d756c680dffd8792d5e53b4bf70a0ff724e92a6da7dc0160b6204ae01c33e51fc3d8c3704b10b8af4f3e80f588e7f9ca00d95edc5f44a825cc653f8e36340
+  metadata.gz: a2b3986cc9434d160b9e5b7efdb3b74513f522eaacd8caf07a4bb641b4d6f2807c09d1d5255787c1a730a9aa3639a92ce0ce26dd011587a7365d0f7d322ed820
+  data.tar.gz: 1f6cf3e3279464919f88782a61eda99c4c464dc743aecc37325226ae92879aad56d4d8d00d69a67d121206f4725fda16170e7268abb59ff5cea2d43463c5f74b

data/app/views/barbeque/apps/edit.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, "Edit #{@app.name} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to(@app.name, app_path(@app.id))
+
 = render 'form'
 
-= link_to 'Back', root_path
+= link_to 'Back', app_path(@app.id)

data/app/views/barbeque/apps/index.html.haml

@@ -1,3 +1,8 @@
+- content_for(:title, 'Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li.active Home
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

data/app/views/barbeque/apps/new.html.haml

@@ -1,3 +1,8 @@
+- content_for(:title, 'New application - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+
 = render 'form'
 
 = link_to 'Back', root_path

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

@@ -1,3 +1,9 @@
+- content_for(:title, "#{@app.name} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li.active #{@app.name}
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

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

@@ -1,3 +1,10 @@
+- content_for(:title, "Edit job definition #{@job_definition.job} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to(@job_definition.app.name, app_path(@job_definition.app.id))
+    %li= link_to(@job_definition.job, job_definition_path(@job_definition.id))
+
 = render 'form'
 
 = link_to 'Back', job_definition_path(@job_definition)

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

@@ -1,3 +1,8 @@
+- content_for(:title, 'Job definitions - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

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

@@ -1,3 +1,10 @@
+- content_for(:title, 'New job definition - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    - if @job_definition.app
+      %li= link_to(@job_definition.app.name, app_path(@job_definition.app.id))
+
 = render 'form'
 
 = link_to 'Back', job_definitions_path

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

@@ -1,3 +1,10 @@
+- content_for(:title, "#{@job_definition.job} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to(@job_definition.app.name, app_path(@job_definition.app.id))
+    %li.active #{@job_definition.job}
+
 .row
   .col-sm-7
     .box.box-primary

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

@@ -1,3 +1,10 @@
+- content_for(:title, "#{@job_definition.job} statistics - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to(@job_definition.app.name, app_path(@job_definition.app.id))
+    %li= link_to(@job_definition.job, job_definition_path(@job_definition.id))
+
 .row
   .col-sm-12
     .box.box-primary

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

@@ -1,3 +1,12 @@
+- content_for(:title, "Job execution ##{@job_execution.id} of #{@job_execution.job_definition.job} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    - job_definition = @job_execution.job_definition
+    %li= link_to('Home', root_path)
+    %li= link_to(job_definition.app.name, app_path(job_definition.app.id))
+    %li= link_to(job_definition.job, job_definition_path(job_definition.id))
+    %li.active ##{@job_execution.id}
+
 .row
   .col-sm-7
     .box.box-primary

data/app/views/barbeque/job_queues/edit.html.haml

@@ -1,3 +1,10 @@
+- content_for(:title, "Edit #{@job_queue.name} job queue - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('Job queues', job_queues_path)
+    %li= link_to(@job_queue.name, job_queue_path(@job_queue.id))
+
 = render 'form'
 
-= link_to 'Back', job_queues_path
+= link_to 'Back', job_queue_path(@job_queue.id)

data/app/views/barbeque/job_queues/index.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, 'Job queues - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li.active Job queues
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

data/app/views/barbeque/job_queues/new.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, 'New job queue - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('Job queues', job_queues_path)
+
 = render 'form'
 
 = link_to 'Back', job_queues_path

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

@@ -1,3 +1,10 @@
+- content_for(:title, "#{@job_queue.name} job queue - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('Job queues', job_queues_path)
+    %li.active= @job_queue.name
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

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

@@ -1,3 +1,14 @@
+- content_for(:title, "Job retry ##{@job_retry.id} of #{@job_retry.job_execution.job_definition.job} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    - job_execution = @job_retry.job_execution
+    - job_definition = job_execution.job_definition
+    %li= link_to('Home', root_path)
+    %li= link_to(job_definition.app.name, app_path(job_definition.app.id))
+    %li= link_to(job_definition.job, job_definition_path(job_definition.id))
+    %li= link_to("##{job_execution.id}", job_execution_path(job_execution.id))
+    %li.active ##{@job_retry.id}
+
 .row
   .col-sm-12
     .box.box-primary

data/app/views/barbeque/monitors/index.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, 'Monitors - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li.active Monitors
+
 .row
   .col-sm-12
     .box.box-primary

data/app/views/barbeque/sns_subscriptions/edit.html.haml

@@ -1,3 +1,10 @@
+- content_for(:title, "Edit SNS subscription between #{@sns_subscription.topic_arn} and #{@sns_subscription.job_queue.name} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('SNS subscriptions', sns_subscriptions_path)
+    %li= link_to(@sns_subscription.topic_arn, sns_subscription_path(@sns_subscription.id))
+
 = render 'form'
 
 = link_to 'Back', sns_subscription_path(@sns_subscription)

data/app/views/barbeque/sns_subscriptions/index.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, 'SNS subscriptions - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li.active SNS subscriptions
+
 .box.box-primary
   .box-header
     %h3.box-title.with_padding

data/app/views/barbeque/sns_subscriptions/new.html.haml

@@ -1,3 +1,9 @@
+- content_for(:title, 'New SNS subscription - Barbeque')
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('SNS subscriptions', sns_subscriptions_path)
+
 = render 'form'
 
 = link_to 'Back', sns_subscriptions_path

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

@@ -1,3 +1,10 @@
+- content_for(:title, "SNS subscription between #{@sns_subscription.topic_arn} and #{@sns_subscription.job_queue.name} - Barbeque")
+- content_for(:header) do
+  %ol.breadcrumb
+    %li= link_to('Home', root_path)
+    %li= link_to('SNS subscriptions', sns_subscriptions_path)
+    %li.active #{@sns_subscription.topic_arn}
+
 .row
   .col-sm-7
     .box.box-primary

data/app/views/layouts/barbeque/application.html.haml

@@ -3,7 +3,7 @@
   %head
     %meta{ content: 'text/html; charset=UTF-8', 'http-equiv': 'Content-Type' }
     %meta{ charset: 'UTF-8' }
-    %title Barbeque
+    %title= content_for(:title)
     %meta{ content: 'width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no', name: 'viewport' }
     -# FIXME: Don't rely on others' CDN
     %link{ href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', rel: 'stylesheet', type: 'text/css' }

data/app/views/layouts/barbeque/sns_subscriptions.html.haml

@@ -0,0 +1,6 @@
+- content_for(:header) do
+  %h1
+    %i.fa.fa-calendar-plus-o
+    SNS Subscriptions
+
+= render template: 'layouts/barbeque/application'

data/lib/barbeque/execution_log.rb

@@ -7,7 +7,7 @@ module Barbeque
     DEFAULT_S3_BUCKET_NAME = 'barbeque'
 
     class << self
-      delegate :save_message, :save_stdout_and_stderr, :load, to: :new
+      delegate :save_message, :save_stdout_and_stderr, :try_save_stdout_and_stderr, :load, to: :new
 
       def s3_client
         @s3_client ||= Aws::S3::Client.new
@@ -28,6 +28,15 @@ module Barbeque
       put(execution, 'stderr.txt', stderr)
     end
 
+    # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
+    # @param [String] stdout
+    # @param [String] stderr
+    def try_save_stdout_and_stderr(execution, stdout, stderr)
+      save_stdout_and_stderr(execution, stdout, stderr)
+    rescue Aws::S3::Errors::ServiceError => e
+      ExceptionHandler.handle_exception(e)
+    end
+
     # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
     # @return [Hash] log
     def load(execution:)

data/lib/barbeque/executor/docker.rb

@@ -1,4 +1,5 @@
 require 'barbeque/docker_image'
+require 'barbeque/execution_log'
 require 'barbeque/slack_notifier'
 require 'open3'
 
@@ -21,7 +22,7 @@ module Barbeque
           Barbeque::DockerContainer.create!(message_id: job_execution.message_id, container_id: stdout.chomp)
           job_execution.update!(status: :running)
         else
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_execution, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_execution, stdout, stderr)
           job_execution.update!(status: :failed, finished_at: Time.zone.now)
           Barbeque::SlackNotifier.notify_job_execution(job_execution)
         end
@@ -41,7 +42,7 @@ module Barbeque
             job_retry.update!(status: :running)
           end
         else
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_retry, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_retry, stdout, stderr)
           Barbeque::ApplicationRecord.transaction do
             job_retry.update!(status: :failed, finished_at: Time.zone.now)
             job_execution.update!(status: :failed)

data/lib/barbeque/executor/hako.rb

@@ -1,4 +1,5 @@
 require 'barbeque/docker_image'
+require 'barbeque/execution_log'
 require 'barbeque/slack_notifier'
 require 'open3'
 require 'uri'
@@ -31,10 +32,10 @@ module Barbeque
         if status.success?
           cluster, task_arn = extract_task_info(stdout)
           Barbeque::EcsHakoTask.create!(message_id: job_execution.message_id, cluster: cluster, task_arn: task_arn)
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_execution, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_execution, stdout, stderr)
           job_execution.update!(status: :running)
         else
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_execution, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_execution, stdout, stderr)
           job_execution.update!(status: :failed, finished_at: Time.zone.now)
           Barbeque::SlackNotifier.notify_job_execution(job_execution)
         end
@@ -50,13 +51,13 @@ module Barbeque
         if status.success?
           cluster, task_arn = extract_task_info(stdout)
           Barbeque::EcsHakoTask.create!(message_id: job_retry.message_id, cluster: cluster, task_arn: task_arn)
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_retry, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_retry, stdout, stderr)
           Barbeque::ApplicationRecord.transaction do
             job_execution.update!(status: :retried)
             job_retry.update!(status: :running)
           end
         else
-          Barbeque::ExecutionLog.save_stdout_and_stderr(job_retry, stdout, stderr)
+          Barbeque::ExecutionLog.try_save_stdout_and_stderr(job_retry, stdout, stderr)
           Barbeque::ApplicationRecord.transaction do
             job_retry.update!(status: :failed, finished_at: Time.zone.now)
             job_execution.update!(status: :failed)

data/lib/barbeque/message_handler/job_execution.rb

@@ -13,12 +13,7 @@ module Barbeque
       end
 
       def run
-        begin
-          job_execution = Barbeque::JobExecution.create(message_id: @message.id, job_definition: job_definition, job_queue: @message_queue.job_queue)
-        rescue ActiveRecord::RecordNotUnique => e
-          raise DuplicatedExecution.new(e.message)
-        end
-        Barbeque::ExecutionLog.save_message(job_execution, @message)
+        job_execution = create_job_execution
         @message_queue.delete_message(@message)
 
         begin
@@ -49,6 +44,16 @@ module Barbeque
           barbeque_apps: { name: @message.application },
         )
       end
+
+      def create_job_execution
+        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)
+          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.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -346,6 +346,7 @@ files:
 - app/views/layouts/barbeque/job_queues.html.haml
 - app/views/layouts/barbeque/job_retries.html.haml
 - app/views/layouts/barbeque/monitors.html.haml
+- app/views/layouts/barbeque/sns_subscriptions.html.haml
 - config/initializers/garage.rb
 - config/routes.rb
 - db/migrate/20160217020910_create_job_queues.rb