summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/trace.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-04-02 04:20:44 +0900
committerShinya Maeda <shinya@gitlab.com>2018-04-05 14:14:54 +0900
commit0971f301fb6e8bfb17e15e6853420ffc008af302 (patch)
treea2e21eb3c7b4fc746507de892ea507d26f995bd2 /lib/gitlab/ci/trace.rb
parentd1632da8c30b69ff915e78a86a661282b8ef24e6 (diff)
downloadgitlab-ce-0971f301fb6e8bfb17e15e6853420ffc008af302.tar.gz
Add new concerns
Diffstat (limited to 'lib/gitlab/ci/trace.rb')
-rw-r--r--lib/gitlab/ci/trace.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index 9db65961a52..83ed58f4845 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -61,7 +61,7 @@ module Gitlab
stream = Gitlab::Ci::Trace::Stream.new do
if trace_artifact
trace_artifact.open
- elsif Feature.enabled?('ci_enable_live_trace') && ChunkedFile::LiveTrace.exists?(job.id)
+ elsif ChunkedFile::LiveTrace.exist?(job.id)
ChunkedFile::LiveTrace.new(job.id, "rb")
elsif current_path
File.open(current_path, "rb")
@@ -109,10 +109,10 @@ module Gitlab
raise ArchiveError, 'Already archived' if trace_artifact
raise ArchiveError, 'Job is not finished yet' unless job.complete?
- if Feature.enabled?('ci_enable_live_trace') && ChunkedFile::LiveTrace.exists?(job.id)
+ if ChunkedFile::LiveTrace.exist?(job.id)
ChunkedFile::LiveTrace.open(job.id, "wb") do |stream|
archive_stream!(stream)
- stream.truncate(0)
+ stream.delete
end
elsif current_path
File.open(current_path) do |stream|