Commit 34e82940 authored by Shinya Maeda's avatar Shinya Maeda

Move default_path to legacy_default_path. Switch to the new path for live-trace

parent afdfe0db
......@@ -92,7 +92,7 @@ module Gitlab
end
def erase!
trace_artifact&.destroy
job.job_artifacts_trace&.destory
paths.each do |trace_path|
FileUtils.rm(trace_path, force: true)
......@@ -101,12 +101,6 @@ module Gitlab
job.erase_old_trace!
end
def current_path
@current_path ||= paths.find do |trace_path|
File.exist?(trace_path)
end
end
private
def ensure_path
......@@ -122,6 +116,12 @@ module Gitlab
end
end
def current_path
@current_path ||= paths.find do |trace_path|
File.exist?(trace_path)
end
end
##
# This method doesn't include the latest path, which is JobArtifactUploader#default_path,
# Because, in EE, traces can be moved to ObjectStorage, so checking paths in Filestorage doesn't make sense.
......
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