Hotfix for builds trace data integrity

Issue #4246
This commit is contained in:
Grzegorz Bizon 2015-12-28 15:28:39 +01:00
parent 19054ba32b
commit 42592201d9

View file

@ -194,8 +194,11 @@ module Ci
end
def raw_trace
if File.exist?(path_to_trace)
if File.file?(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
# backward compatibility
read_attribute :trace
@ -231,6 +234,24 @@ module Ci
"#{dir_to_trace}/#{id}.log"
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
project.runners_token
end