barbeque 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd657c4fecd71f71469707c7583541cc8d3dab7
-  data.tar.gz: f6911be9efb1970c036697bcc8e5a46edbdb605d
+  metadata.gz: 58e7a032e02c8f3b25da0acf89cb8636677c3256
+  data.tar.gz: f403cc33bbe0dd813f0e48561dfd873c305e92a8
 SHA512:
-  metadata.gz: 4d89b39fd628a67c7144613989d77c0b4fc3407c307e9409991263ad704b2e667d73981519ed59a543d24ba21c94e390830965c9e6eb3f823127acbf3d3996c2
-  data.tar.gz: 5697f62a1d5053fd2ab82ac60cabc4a6ad70eea87317fd6d800e251ab242e7a55edfc86299eec598c3b6d4c0111829f3f7387e21f7ddc726ce96d7e22d3e12d7
+  metadata.gz: a6eb976a11b1ddccd77e30e26a350d583440a72ef98ac38a47527bc5481c45bf407b75d8eee713baef789cfbdc06a51163646162c12fa3dd4588f05a26261611
+  data.tar.gz: 032fc003c5b8285c870d278421480d309c1aab60d8f8f5d5985a0fb319221230355895fa3c4588be042f5e844fd188aa663f02edd15b025b7c65c8ec068b42d1

data/lib/barbeque/exception_handler.rb

@@ -3,25 +3,51 @@ require 'barbeque/config'
 module Barbeque
   module ExceptionHandler
     class << self
-      def handle_exception(e)
-        handler.handle_exception(e)
-      end
+      delegate :clear_context, :set_message_context, :handle_exception, to: :handler
 
       private
 
       def handler
-        @handler ||= const_get(Barbeque.config.exception_handler, false)
+        @handler ||= const_get(Barbeque.config.exception_handler, false).new
       end
     end
 
-    module RailsLogger
-      def self.handle_exception(e)
-        Rails.logger.error("#{e.inspect}\n#{e.backtrace.join("\n")}")
+    class RailsLogger
+      def initialize
+        clear_context
+      end
+
+      def clear_context
+        @message_id = nil
+        @message_type = nil
+      end
+
+      # @param [String] message_id
+      # @param [String, nil] message_type
+      def set_message_context(message_id, message_type)
+        @message_id = message_id
+        @message_type = message_type
+      end
+
+      # @param [Exception] e
+      def handle_exception(e)
+        Rails.logger.error("#{e.inspect}\nmessage_id: #{@message_id}, message_type: #{@message_type}\n#{e.backtrace.join("\n")}")
       end
     end
 
-    module Raven
-      def self.handle_exception(e)
+    class Raven
+      def clear_context
+        ::Raven::Context.clear!
+      end
+
+      # @param [String] message_id
+      # @param [String, nil] message_type
+      def set_message_context(message_id, message_type)
+        ::Raven.tags_context(message_id: message_id, message_type: message_type)
+      end
+
+      # @param [Exception] e
+      def handle_exception(e)
         ::Raven.capture_exception(e)
       end
     end

data/lib/barbeque/execution_poller.rb

@@ -1,3 +1,5 @@
+require 'barbeque/exception_handler'
+
 module Barbeque
   class ExecutionPoller
     def initialize
@@ -27,6 +29,7 @@ module Barbeque
     private
 
     def poll(job_execution)
+      Barbeque::ExceptionHandler.set_message_context(job_execution.message_id, nil)
       executor = Executor.create
       executor.poll_execution(job_execution)
     end

data/lib/barbeque/executor/docker.rb

@@ -18,11 +18,11 @@ module Barbeque
         cmd = build_docker_run_command(docker_image, job_execution.job_definition.command, envs)
         stdout, stderr, status = Open3.capture3(*cmd)
         if status.success?
-          job_execution.update!(status: :running)
           Barbeque::DockerContainer.create!(message_id: job_execution.message_id, container_id: stdout.chomp)
+          job_execution.update!(status: :running)
         else
-          job_execution.update!(status: :failed, finished_at: Time.zone.now)
           Barbeque::ExecutionLog.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
       end

data/lib/barbeque/executor/hako.rb

@@ -29,13 +29,13 @@ module Barbeque
         cmd = build_hako_oneshot_command(docker_image, job_execution.job_definition.command, envs)
         stdout, stderr, status = Bundler.with_clean_env { Open3.capture3(@hako_env, *cmd, chdir: @hako_dir) }
         if status.success?
-          job_execution.update!(status: :running)
           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)
+          job_execution.update!(status: :running)
         else
-          job_execution.update!(status: :failed, finished_at: Time.zone.now)
           Barbeque::ExecutionLog.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
       end

data/lib/barbeque/retry_poller.rb

@@ -27,6 +27,7 @@ module Barbeque
     private
 
     def poll(job_retry)
+      Barbeque::ExceptionHandler.set_message_context(job_retry.message_id, nil)
       executor = Executor.create
       executor.poll_retry(job_retry)
     end

data/lib/barbeque/runner.rb

@@ -22,6 +22,7 @@ module Barbeque
       message = message_queue.dequeue
       return unless message
 
+      Barbeque::ExceptionHandler.set_message_context(message.id, message.type)
       handler = MessageHandler.const_get(message.type, false)
       handler.new(message: message, message_queue: message_queue).run
     end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/barbeque/worker.rb

@@ -1,3 +1,4 @@
+require 'barbeque/exception_handler'
 require 'barbeque/execution_poller'
 require 'barbeque/retry_poller'
 require 'barbeque/runner'
@@ -50,6 +51,7 @@ module Barbeque
         rescue => e
           Barbeque::ExceptionHandler.handle_exception(e)
         end
+        Barbeque::ExceptionHandler.clear_context
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails