Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-01-25 17:52:35 +0300
committerShinya Maeda <shinya@gitlab.com>2018-02-06 09:50:07 +0300
commitb9692501060b3543bd3289bd806920044516db8c (patch)
tree2bfbd83bafce752bec50e099a02693bd6dd2f442 /lib/gitlab/ci/trace.rb
parent1d983024db59ab9791c9a8705e71f20cd9346893 (diff)
Check existance of the file when trace_artifact is read
Diffstat (limited to 'lib/gitlab/ci/trace.rb')
-rw-r--r--lib/gitlab/ci/trace.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index aff60467bb1..27f5869770e 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -65,7 +65,7 @@ module Gitlab
def read
stream = Gitlab::Ci::Trace::Stream.new do
- if trace_artifact
+ if trace_artifact&.exists?
trace_artifact.open
elsif current_path
File.open(current_path, "rb")
@@ -92,7 +92,7 @@ module Gitlab
end
def erase!
- job.job_artifacts_trace&.destory
+ trace_artifact&.destory
paths.each do |trace_path|
FileUtils.rm(trace_path, force: true)