Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
42592201
Commit
42592201
authored
Dec 28, 2015
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hotfix for builds trace data integrity
Issue #4246
parent
19054ba3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
1 deletion
+22
-1
app/models/ci/build.rb
app/models/ci/build.rb
+22
-1
No files found.
app/models/ci/build.rb
View file @
42592201
...
@@ -194,8 +194,11 @@ module Ci
...
@@ -194,8 +194,11 @@ module Ci
end
end
def
raw_trace
def
raw_trace
if
File
.
exist
?
(
path_to_trace
)
if
File
.
file
?
(
path_to_trace
)
File
.
read
(
path_to_trace
)
File
.
read
(
path_to_trace
)
elsif
File
.
file?
(
old_path_to_trace
)
# Temporary fix for build trace data integrity
File
.
read
(
old_path_to_trace
)
else
else
# backward compatibility
# backward compatibility
read_attribute
:trace
read_attribute
:trace
...
@@ -231,6 +234,24 @@ module Ci
...
@@ -231,6 +234,24 @@ module Ci
"
#{
dir_to_trace
}
/
#{
id
}
.log"
"
#{
dir_to_trace
}
/
#{
id
}
.log"
end
end
##
# Deprecated
#
def
old_dir_to_trace
File
.
join
(
Settings
.
gitlab_ci
.
builds_path
,
created_at
.
utc
.
strftime
(
"%Y_%m"
),
project
.
ci_id
.
to_s
)
end
##
# Deprecated
#
def
old_path_to_trace
"
#{
old_dir_to_trace
}
/
#{
id
}
.log"
end
def
token
def
token
project
.
runners_token
project
.
runners_token
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment