kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert "Use Dir.mktmpdir"

Browse source 
This reverts commit 28c6a6b044.
This commit is contained in:
Shinya Maeda 2018-02-24 02:35:03 +09:00
parent 28c6a6b044
commit 34e16110e0
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/services/ci/create_trace_artifact_service.rb
View file

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