Commit 8a56c5a1 authored by Shinya Maeda's avatar Shinya Maeda

Revert "Revert "Use Dir.mktmpdir""

This reverts commit 34e16110.
parent 34e16110
...@@ -6,9 +6,8 @@ module Ci ...@@ -6,9 +6,8 @@ module Ci
job.trace.read do |stream| job.trace.read do |stream|
break unless stream.file? break unless stream.file?
temp_file!(JobArtifactUploader.workhorse_upload_path) do |temp_path| clone_file!(stream.path, JobArtifactUploader.workhorse_upload_path) do |clone_path|
FileUtils.copy(stream.path, temp_path) create_job_trace!(job, clone_path)
create_job_trace!(job, temp_path)
FileUtils.rm(stream.path) FileUtils.rm(stream.path)
end end
end end
...@@ -17,21 +16,21 @@ module Ci ...@@ -17,21 +16,21 @@ module Ci
private private
def create_job_trace!(job, path) def create_job_trace!(job, path)
job.create_job_artifacts_trace!( File.open(path) do |stream|
project: job.project, job.create_job_artifacts_trace!(
file_type: :trace, project: job.project,
file: UploadedFile.new(path, 'job.log', 'application/octet-stream') file_type: :trace,
) file: stream)
end
end end
def temp_file!(temp_dir) def clone_file!(src_path, temp_dir)
FileUtils.mkdir_p(temp_dir) FileUtils.mkdir_p(temp_dir)
temp_file = Tempfile.new('trace-tmp-', temp_dir) Dir.mktmpdir('tmp-trace', temp_dir) do |dir_path|
temp_file&.close temp_path = File.join(dir_path, "job.log")
yield(temp_file.path) FileUtils.copy(src_path, temp_path)
ensure yield(temp_path)
temp_file&.close end
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