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-07-05 04:56:15 +0300
committerShinya Maeda <shinya@gitlab.com>2018-07-05 04:56:15 +0300
commit254134fbb5557caa95c93876a4131c1c5afaf91f (patch)
tree639cf7bd4ec217ce6f2cc38e508176eefaeedc72 /lib/gitlab/ci/trace.rb
parent68d5793985d36fc649cf7bc0e81b5ef988bca8b1 (diff)
Prevent WRITE opetaions if it's already archived
Diffstat (limited to 'lib/gitlab/ci/trace.rb')
-rw-r--r--lib/gitlab/ci/trace.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index a52d71225bb..6a65cec5f03 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -6,6 +6,7 @@ module Gitlab
LEASE_TIMEOUT = 1.hour
ArchiveError = Class.new(StandardError)
+ WriteError = Class.new(StandardError)
attr_reader :job
@@ -81,7 +82,9 @@ module Gitlab
def write(mode)
stream = Gitlab::Ci::Trace::Stream.new do
- if current_path
+ if trace_artifact
+ raise WriteError, 'Already archived'
+ elsif current_path
File.open(current_path, mode)
elsif Feature.enabled?('ci_enable_live_trace')
Gitlab::Ci::Trace::ChunkedIO.new(job)