From cd12ba5402da92060f09039c4f21c6b28182a024 Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 3 Aug 2016 15:48:34 +0200 Subject: [PATCH] remove method from model, add logic to query --- lib/travis/api/v3/models/log_part.rb | 6 ------ lib/travis/api/v3/queries/log.rb | 21 ++++++++------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/lib/travis/api/v3/models/log_part.rb b/lib/travis/api/v3/models/log_part.rb index d695e2e6..103ef0e1 100644 --- a/lib/travis/api/v3/models/log_part.rb +++ b/lib/travis/api/v3/models/log_part.rb @@ -2,11 +2,5 @@ module Travis::API::V3 class Models::LogPart < Model establish_connection 'logs_database' belongs_to :log - - def replicate_log_parts_object(value) - # use this method to turn archived s3 log into something that looks - # like the log_parts object the logs db log_part query send to the router/renderer - - end end end diff --git a/lib/travis/api/v3/queries/log.rb b/lib/travis/api/v3/queries/log.rb index d9944a26..464f78c5 100644 --- a/lib/travis/api/v3/queries/log.rb +++ b/lib/travis/api/v3/queries/log.rb @@ -14,20 +14,15 @@ module Travis::API::V3 archived_log_path = archive_url("/jobs/#{params[:job.id]}/log.txt") content = open(Net::HTTP.get(URI.parse(archived_log_path))) - ## log_part - #, - ## id: nil, - ## log_id: log.id, - ## content: {"[INFO] Fetching org.eclipse.jface_3.11.1.v20160128-...}", - ## number: start at 0, increment by 1, - ## final: false, - ## created_at: log.created_at + log_parts = [] + number = 0 - # log_parts = [] - # content.each_line do |line| - # log_parts << line.chop - # end - # log_parts + content.each_line do |line| + log_part = Models::LogPart.new(id: nil, log_id: log.id, content: line.chomp, number: number, final: false, created_at: log.created_at) + number += 1 + log_parts << log_part + end + log_parts else raise EntityMissing, 'log not found'.freeze end