From 13408d875acbc9e6e80460314fd095bfce4ebef8 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 3 Sep 2014 13:55:19 +0200 Subject: [PATCH 1/3] Implement fallback for pusher log messages If we don't get any pusher messages with log updates after 5 seconds, we will try to download them from the API. --- assets/scripts/app/models/log.coffee | 25 +++++- assets/scripts/lib/travis/log_chunks.coffee | 81 +++++++++++++++++++ .../scripts/spec/unit/log_chunks_spec.coffee | 73 +++++++++++++++++ 3 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 assets/scripts/lib/travis/log_chunks.coffee create mode 100644 assets/scripts/spec/unit/log_chunks_spec.coffee diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index 5671199d..a701a73b 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -1,5 +1,5 @@ require 'travis/model' -require 'travis/chunk_buffer' +require 'travis/log_chunks' @Travis.Log = Em.Object.extend version: 0 # used to refresh log on requeue @@ -9,8 +9,29 @@ require 'travis/chunk_buffer' init: -> @setParts() + fetchMissingParts: (partNumbers, after) -> + # TODO: don't download if job is not running and log is finalized + data = {} + data['part_numbers'] = partNumbers if partNumbers + data['after'] = after if after + + Travis.ajax.ajax "/jobs/#{@get('job.id')}/log", 'GET', + dataType: 'json' + headers: + accept: 'application/json; chunked=true; version=2' + data: data + success: (body, status, xhr) => + Ember.run this, -> + if parts = body.log.parts + for part in parts + @append part + setParts: -> - @set 'parts', Ember.ArrayProxy.create(content: []) + if parts = @get('parts') + parts.destroy() + + parts = Travis.LogChunks.create(content: [], missingPartsCallback: => @fetchMissingParts.apply(this, arguments)) + @set 'parts', parts # @set 'parts', Travis.ChunkBuffer.create(content: []) fetch: -> diff --git a/assets/scripts/lib/travis/log_chunks.coffee b/assets/scripts/lib/travis/log_chunks.coffee new file mode 100644 index 00000000..d3424e6c --- /dev/null +++ b/assets/scripts/lib/travis/log_chunks.coffee @@ -0,0 +1,81 @@ +Travis.LogChunks = Em.ArrayProxy.extend + timeout: 10000 + + init: -> + @setTimeout() + + @_super.apply(this, arguments) + + resetTimeout: -> + id = @get('timeoutId') + clearTimeout(id) + + @setTimeout() + + setTimeout: -> + id = setTimeout( => + return if @get('finalized') || @get('isDestroyed') + + @triggerMissingParts() + @setTimeout() + , @get('timeout')) + + @set('timeoutId', id) + + triggerMissingParts: -> + callback = @get('missingPartsCallback') + return unless callback + + content = @get('content') + last = @get('last') + missing = null + after = null + + if last + existing = content.mapBy('number') + all = [1..last.number] + + missing = all.removeObjects(existing) + + unless last.final + # if last chunk is not final, we should try a few next chunks. At the moment + # there's no API for that, so let's just try 10 next chunks + after = last.number + + callback(missing, after) + + last: (-> + max = -1 + last = null + for part in @get('content') + if part.number > max + max = part.number + last = part + + last + ).property('content.[]', 'final') + + final: (-> + @get('content').findBy('final', true) + ).property() + + tryFinalizing: -> + content = @get('content') + last = @get('last') + + if last.final && last.number == content.length + # we have all parts + @set('finalized', true) + + contentArrayDidChange: (array, index, removedCount, addedCount) -> + @_super.apply this, arguments + + if addedCount + addedObjects = array.slice(index, index + addedCount) + for part in addedObjects + if part.final + @notifyPropertyChange('final') + + Ember.run.once this, -> + @tryFinalizing() + @resetTimeout() diff --git a/assets/scripts/spec/unit/log_chunks_spec.coffee b/assets/scripts/spec/unit/log_chunks_spec.coffee new file mode 100644 index 00000000..a50918be --- /dev/null +++ b/assets/scripts/spec/unit/log_chunks_spec.coffee @@ -0,0 +1,73 @@ +module "Travis.LogChunks" + +test "it doesn't trigger downloading missing parts if they come in timely fashion", -> + expect(2) + stop() + + callback = -> ok false, 'callback should not be called' + + chunks = Travis.LogChunks.create(timeout: 15, missingPartsCallback: callback, content: []) + + setTimeout (-> chunks.pushObject(number: 1, final: false)), 10 + setTimeout (-> chunks.pushObject(number: 2, final: false)), 20 + setTimeout -> + ok true + chunks.pushObject(number: 3, final: true) + start() + + equal(chunks.get('finalized'), true, 'log should be finalized') + , 30 + +test "it triggers downloading missing parts if there is a missing part, even though final part arrived", -> + expect(2) + stop() + + callback = (missingNumbers) -> + deepEqual(missingNumbers, [2, 3], 'callback should be called with missing numbers') + + chunks = Travis.LogChunks.create(timeout: 15, missingPartsCallback: callback, content: []) + + chunks.pushObject(number: 1, final: false) + setTimeout -> + chunks.pushObject(number: 4, final: true) + + ok(!chunks.get('finalized'), "log shouldn't be finalized") + , 10 + + setTimeout -> + Ember.run -> chunks.destroy() # destroy object to not fire more callbacks + start() + , 40 + +test "it triggers downloading next parts if there is no final part", -> + expect(2) + stop() + + callback = (missingNumbers, after) -> + deepEqual(missingNumbers, [2], 'callback should be called with missing numbers') + equal(after, 3, 'callback should be called with "after" argument') + + chunks = Travis.LogChunks.create(timeout: 15, missingPartsCallback: callback, content: []) + + chunks.pushObject(number: 1, final: false) + chunks.pushObject(number: 3, final: false) + + setTimeout -> + Ember.run -> chunks.destroy() # destroy object to not fire more callbacks + start() + , 35 + +test "it triggers downloading all available parts if there is no parts yet" + expect(1) + stop() + + callback = (missingNumbers, after) -> + ok(!missingNumbers, 'there should be no missing parts') + ok(!after, 'after should not be specified') + + chunks = Travis.LogChunks.create(timeout: 15, missingPartsCallback: callback, content: []) + + setTimeout -> + Ember.run -> chunks.destroy() # destroy object to not fire more callbacks + start() + , 25 From 1297c99396b9c7362b0f09fdeb307e1519d9e3bb Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 12 Sep 2014 15:43:43 +0200 Subject: [PATCH 2/3] Don't fetch missing log parts if test haven't started yet --- assets/scripts/app/models/log.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index a701a73b..26c4323f 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -10,7 +10,8 @@ require 'travis/log_chunks' @setParts() fetchMissingParts: (partNumbers, after) -> - # TODO: don't download if job is not running and log is finalized + return if @get('notStarted') + data = {} data['part_numbers'] = partNumbers if partNumbers data['after'] = after if after From 43a7ad927f5890fd77697eed06cc71cf6f86c256 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 12 Sep 2014 15:45:47 +0200 Subject: [PATCH 3/3] Fix tests syntax --- assets/scripts/spec/unit/log_chunks_spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/spec/unit/log_chunks_spec.coffee b/assets/scripts/spec/unit/log_chunks_spec.coffee index a50918be..d08bedd0 100644 --- a/assets/scripts/spec/unit/log_chunks_spec.coffee +++ b/assets/scripts/spec/unit/log_chunks_spec.coffee @@ -57,7 +57,7 @@ test "it triggers downloading next parts if there is no final part", -> start() , 35 -test "it triggers downloading all available parts if there is no parts yet" +test "it triggers downloading all available parts if there is no parts yet", -> expect(1) stop()