active_encode 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36b69edd440383a39009cc2a331f6cda32974e62fde4961353e5abd80e2bc0b
-  data.tar.gz: ce26e5a14a08c96b708d6fea08ff127606f9da7023a674444037374cf9812ef9
+  metadata.gz: 5347f6f8d85a2181c8a2a8961edfaea95c4e29606ef02b13eaa44145e322bfb2
+  data.tar.gz: '05810638aea1f82ae53098c06099990e07ee1bc7c0c513d7088e90ab79b7f8b8'
 SHA512:
-  metadata.gz: d82bbc86cfc93cc33d699fb943c5b1caab27bc76b8149a599a61514f5257572aa3f0239ab617062f5b9ed4ef5b3874b9764f6786b0700fe2fa08625b917ead07
-  data.tar.gz: 53aabadb2c2337ac2cf8725ca0476b5afb9446aa8102aa156e93913d978317ceece57facf2bce0775fb8d5e3cf6e5a9ad47538c15006aed40d7bb94b98e301ce
+  metadata.gz: 7e4447428944fb5a156ed73d13f5b6a9480b237fc6021ddcbee3d7975bb7d390793a3796fe41cd6b2f2f55486d148aac157850168ea215e34fc5debbb536cd41
+  data.tar.gz: 63911ec850c0648e57d3b180b629464e26ee7ffe623f0f787cd2ee79b69ca1af5e06d0e7569a5e975a6d6540b325f44410d2830aadf1f309374bb779101990ef

data/lib/active_encode/engine_adapters/media_convert_adapter.rb

@@ -51,6 +51,15 @@ module ActiveEncode
         cmaf: { fragment_length: 2, segment_control: "SEGMENTED_FILES", segment_length: 10 }
       }.freeze
 
+      class ResultsNotAvailable < RuntimeError
+        attr_reader :encode
+
+        def initialize(msg = nil, encode = nil)
+          @encode = encode
+          super(msg)
+        end
+      end
+
       attr_accessor :role, :output_bucket
       attr_writer :log_group, :queue
 
@@ -167,11 +176,23 @@ module ActiveEncode
           encode.updated_at = job.timing.finish_time || job.timing.start_time || encode.created_at
           encode.percent_complete = convert_percent_complete(job)
           encode.errors = [job.error_message].compact
+          encode.output = []
 
           encode.input.created_at = encode.created_at
           encode.input.updated_at = encode.updated_at
 
-          encode.output = encode.state == :completed ? convert_output(job) : []
+          encode = complete_encode(encode, job) if encode.state == :completed
+          encode
+        end
+
+        def complete_encode(encode, job)
+          result = convert_output(job)
+          if result.nil?
+            raise ResultsNotAvailable.new("Unable to load progress for job #{job.id}", encode) if job.timing.finish_time < 10.minutes.ago
+            encode.state = :running
+          else
+            encode.output = result
+          end
           encode
         end
 
@@ -192,6 +213,11 @@ module ActiveEncode
 
         def convert_output(job)
           results = get_encode_results(job)
+          return nil if results.nil?
+          convert_encode_results(job, results)
+        end
+
+        def convert_encode_results(job, results)
           settings = job.settings.output_groups.first.outputs
 
           outputs = results.dig('detail', 'outputGroupDetails', 0, 'outputDetails').map.with_index do |detail, index|
@@ -228,7 +254,7 @@ module ActiveEncode
 
         def get_encode_results(job)
           start_time = job.timing.submit_time
-          end_time = job.timing.finish_time || Time.now.utc
+          end_time = (job.timing.finish_time || Time.now.utc) + 10.minutes
 
           response = cloudwatch_logs.start_query(
             log_group_name: log_group,
@@ -243,7 +269,8 @@ module ActiveEncode
             sleep(0.5)
             response = cloudwatch_logs.get_query_results(query_id: query_id)
           end
-          raise ActiveEncode::NotFound, "Unable to load progress for job #{job.id}" if response.results.empty?
+
+          return nil if response.results.empty?
 
           JSON.parse(response.results.first.first.value)
         end

data/lib/active_encode/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveEncode
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/spec/fixtures/media_convert/job_completed_empty_detail.json

@@ -0,0 +1 @@
+{"results":[],"statistics":{"records_matched":1.0,"records_scanned":13.0,"bytes_scanned":10750.0},"status":"Complete"}

data/spec/integration/media_convert_adapter_spec.rb

@@ -87,6 +87,16 @@ describe ActiveEncode::EngineAdapters::MediaConvertAdapter do
     ActiveEncode::Base.find(job_id)
   end
 
+  let(:recent_completed_job_without_results) do
+    job_response = reconstitute_response("media_convert/job_completed.json")
+    job_response["job"]["timing"]["finish_time"] = 5.minutes.ago
+    mediaconvert.stub_responses(:get_job, job_response)
+    cloudwatch_logs.stub_responses(:start_query, reconstitute_response("media_convert/job_completed_detail_query.json"))
+    cloudwatch_logs.stub_responses(:get_query_results, reconstitute_response("media_convert/job_completed_empty_detail.json"))
+
+    ActiveEncode::Base.find(job_id)
+  end
+
   let(:failed_job) do
     mediaconvert.stub_responses(:get_job, reconstitute_response("media_convert/job_failed.json"))
 
@@ -122,5 +132,21 @@ describe ActiveEncode::EngineAdapters::MediaConvertAdapter do
         end
       end
     end
+
+    it "has no logging entries but finished within the last 10 minutes" do
+      expect(recent_completed_job_without_results.state).to eq(:running)
+    end
+
+    it "finished more than 10 minutes ago but has no logging entries" do
+      mediaconvert.stub_responses(:get_job, reconstitute_response("media_convert/job_completed.json"))
+      cloudwatch_logs.stub_responses(:start_query, reconstitute_response("media_convert/job_completed_detail_query.json"))
+      cloudwatch_logs.stub_responses(:get_query_results, reconstitute_response("media_convert/job_completed_empty_detail.json"))
+
+      expect { ActiveEncode::Base.find(job_id) }.to raise_error do |error|
+        expect(error).to be_a(ActiveEncode::EngineAdapters::MediaConvertAdapter::ResultsNotAvailable)
+        expect(error.encode).to be_a(ActiveEncode::Base)
+        expect(error.encode.state).to eq(:completed)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_encode
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Michael Klein, Chris Colvard, Phuong Dinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -344,6 +344,7 @@ files:
 - spec/fixtures/media_convert/job_completed.json
 - spec/fixtures/media_convert/job_completed_detail.json
 - spec/fixtures/media_convert/job_completed_detail_query.json
+- spec/fixtures/media_convert/job_completed_empty_detail.json
 - spec/fixtures/media_convert/job_created.json
 - spec/fixtures/media_convert/job_failed.json
 - spec/fixtures/media_convert/job_progressing.json
@@ -469,6 +470,7 @@ test_files:
 - spec/fixtures/media_convert/job_completed.json
 - spec/fixtures/media_convert/job_completed_detail.json
 - spec/fixtures/media_convert/job_completed_detail_query.json
+- spec/fixtures/media_convert/job_completed_empty_detail.json
 - spec/fixtures/media_convert/job_created.json
 - spec/fixtures/media_convert/job_failed.json
 - spec/fixtures/media_convert/job_progressing.json