barbeque 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c926b3660782c169804dc6f07c16757ed051c9df
-  data.tar.gz: fc2df2f86cb3c6cf4192ce810a47024b8483fb06
+  metadata.gz: e23cea0a69664e6f2351d1651daaf0b42355a71f
+  data.tar.gz: 4c76a4e57cbb43baa302841f7eb565a1f3602fb6
 SHA512:
-  metadata.gz: 50f25fbd8525e4ce581cf92212565170ce1256666be8e917a9dc114fe8bfe0e499e20add7da02cb5647acafa924fac744cd78df85dade310cb9f745bb644efc1
-  data.tar.gz: d4389a130d4e0939bacdafdeec7e623851a6ea01414bdc19fef82cf29a46f64d8201a2ee1328157885235fd4534421242f90d6f2bfdb591b6f6c0b73db715180
+  metadata.gz: 1021988ef2880d1bb8009d5c2fb397803a0e9a02577ff66cd961638f415dd877012340bb86564b6855efa1c65d44751b1bffc16aea1bce98697465f3c4a1b940
+  data.tar.gz: 0e48ddda04e6ebb25e5cff2bcc7c21f440848b2a5588286eb9e89289d70d5b6863bdb00ebe9c7d6dc70424bba37bbc143795e7cc055fcc089518a57a3375f8c7

data/lib/barbeque/execution_log.rb

@@ -7,21 +7,25 @@ module Barbeque
     DEFAULT_S3_BUCKET_NAME = 'barbeque'
 
     class << self
-      delegate :save, :load, to: :new
+      delegate :save_message, :save_stdout_and_stderr, :load, to: :new
 
       def s3_client
         @s3_client ||= Aws::S3::Client.new
       end
     end
 
+    # @param [Barbeque::JobExecution] execution
+    # @param [Barbeque::Message::JobExecution] message
+    def save_message(execution, message)
+      put(execution, 'message.json', message.body.to_json)
+    end
+
     # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
-    # @param [Hash] log
-    def save(execution:, log:)
-      ExecutionLog.s3_client.put_object(
-        bucket: s3_bucket_name,
-        key:    s3_key_for(execution: execution),
-        body:   log.to_json,
-      )
+    # @param [String] stdout
+    # @param [String] stderr
+    def save_stdout_and_stderr(execution, stdout, stderr)
+      put(execution, 'stdout.txt', stdout)
+      put(execution, 'stderr.txt', stderr)
     end
 
     # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
@@ -29,13 +33,27 @@ module Barbeque
     def load(execution:)
       return {} if execution.pending?
 
-      s3_object = ExecutionLog.s3_client.get_object(
-        bucket: s3_bucket_name,
-        key:    s3_key_for(execution: execution),
-      )
-      JSON.load(s3_object.body.read)
-    rescue Aws::S3::Errors::NoSuchKey
-      nil
+      message = get(execution, 'message.json')
+      stdout = get(execution, 'stdout.txt')
+      stderr = get(execution, 'stderr.txt')
+      if message || stdout || stderr
+        {
+          'message' => message,
+          'stdout' => stdout,
+          'stderr' => stderr,
+        }
+      else
+        # Try to load legacy format
+        begin
+          s3_object = ExecutionLog.s3_client.get_object(
+            bucket: s3_bucket_name,
+            key: legacy_s3_key_for(execution),
+          )
+          JSON.parse(s3_object.body.read)
+        rescue Aws::S3::Errors::NoSuchKey
+          nil
+        end
+      end
     end
 
     private
@@ -45,9 +63,38 @@ module Barbeque
     end
 
     # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
-    # @param [String] message_id
-    def s3_key_for(execution:)
-      File.join(execution.app.name, execution.job_definition.job, execution.message_id)
+    # @param [String] filename
+    def s3_key_for(execution, filename)
+      "#{execution.app.name}/#{execution.job_definition.job}/#{execution.message_id}/#{filename}"
+    end
+
+    # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
+    def legacy_s3_key_for(execution)
+      "#{execution.app.name}/#{execution.job_definition.job}/#{execution.message_id}"
+    end
+
+    # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
+    # @param [String] filename
+    # @return [String]
+    def get(execution, filename)
+      s3_object = ExecutionLog.s3_client.get_object(
+        bucket: s3_bucket_name,
+        key: s3_key_for(execution, filename),
+      )
+      s3_object.body.read
+    rescue Aws::S3::Errors::NoSuchKey
+      nil
+    end
+
+    # @param [Barbeque::JobExecution,Barbeque::JobRetry] execution
+    # @param [String] filename
+    # @param [String] content
+    def put(execution, filename, content)
+      ExecutionLog.s3_client.put_object(
+        bucket: s3_bucket_name,
+        key: s3_key_for(execution, filename),
+        body: content,
+      )
     end
   end
 end

data/lib/barbeque/message_handler/job_execution.rb

@@ -38,8 +38,8 @@ module Barbeque
       private
 
       def log_result(execution, stdout, stderr)
-        log = { message: @message.body.to_json, stdout: stdout, stderr: stderr }
-        Barbeque::ExecutionLog.save(execution: execution, log: log)
+        Barbeque::ExecutionLog.save_message(execution, @message)  # TODO: Should be saved earlier
+        Barbeque::ExecutionLog.save_stdout_and_stderr(execution, stdout, stderr)
       end
 
       def notify_slack(job_execution)

data/lib/barbeque/message_handler/job_retry.rb

@@ -44,8 +44,7 @@ module Barbeque
       private
 
       def log_result(job_retry, stdout, stderr)
-        log = { stdout: stdout, stderr: stderr }
-        Barbeque::ExecutionLog.save(execution: job_retry, log: log)
+        Barbeque::ExecutionLog.save_stdout_and_stderr(job_retry, stdout, stderr)
       end
 
       # @param [Barbeque::JobRetry] job_retry

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end

metadata

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