Commit 801e4271 authored by Kamil Trzciński's avatar Kamil Trzciński Committed by Shinya Maeda

Minimal fix for artifacts service

parent 58a312f5
...@@ -4,13 +4,34 @@ module Ci ...@@ -4,13 +4,34 @@ module Ci
return if job.job_artifacts_trace return if job.job_artifacts_trace
job.trace.read do |stream| job.trace.read do |stream|
if stream.file? return unless stream.file?
temp_file!(JobArtifactUploader.workhorse_upload_path) do |temp_path|
FileUtils.cp(stream.path, temp_path)
create_job_trace!(temp_path)
FileUtils.rm(stream.path)
end
end
end
private
def create_job_trace!(path)
job.create_job_artifacts_trace!( job.create_job_artifacts_trace!(
project: job.project, project: job.project,
file_type: :trace, file_type: :trace,
file: stream) file: UploadedFile.new(path, 'build.log', 'application/octet-stream')
end )
end end
def temp_file!(temp_dir)
FileUtils.mkdir_p(temp_dir)
temp_file = Tempfile.new('file', temp_dir)
temp_file&.close
yield(temp_file.path)
ensure
temp_file&.close
temp_file&.unlink
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment