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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
34e16110
Commit
34e16110
authored
Feb 24, 2018
by
Shinya Maeda
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use Dir.mktmpdir"
This reverts commit
28c6a6b0
.
parent
28c6a6b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
app/services/ci/create_trace_artifact_service.rb
app/services/ci/create_trace_artifact_service.rb
+15
-14
No files found.
app/services/ci/create_trace_artifact_service.rb
View file @
34e16110
...
@@ -6,8 +6,9 @@ module Ci
...
@@ -6,8 +6,9 @@ module Ci
job
.
trace
.
read
do
|
stream
|
job
.
trace
.
read
do
|
stream
|
break
unless
stream
.
file?
break
unless
stream
.
file?
clone_file!
(
stream
.
path
,
JobArtifactUploader
.
workhorse_upload_path
)
do
|
clone_path
|
temp_file!
(
JobArtifactUploader
.
workhorse_upload_path
)
do
|
temp_path
|
create_job_trace!
(
job
,
clone_path
)
FileUtils
.
copy
(
stream
.
path
,
temp_path
)
create_job_trace!
(
job
,
temp_path
)
FileUtils
.
rm
(
stream
.
path
)
FileUtils
.
rm
(
stream
.
path
)
end
end
end
end
...
@@ -16,21 +17,21 @@ module Ci
...
@@ -16,21 +17,21 @@ module Ci
private
private
def
create_job_trace!
(
job
,
path
)
def
create_job_trace!
(
job
,
path
)
File
.
open
(
path
)
do
|
stream
|
job
.
create_job_artifacts_trace!
(
job
.
create_job_artifacts_trace!
(
project:
job
.
project
,
project:
job
.
project
,
file_type: :trace
,
file_type: :trace
,
file:
UploadedFile
.
new
(
path
,
'job.log'
,
'application/octet-stream'
)
file:
stream
)
)
end
end
end
def
clone_file!
(
src_path
,
temp_dir
)
def
temp_file!
(
temp_dir
)
FileUtils
.
mkdir_p
(
temp_dir
)
FileUtils
.
mkdir_p
(
temp_dir
)
Dir
.
mktmpdir
(
'tmp-trace'
,
temp_dir
)
do
|
dir_path
|
temp_file
=
Tempfile
.
new
(
'trace-tmp-'
,
temp_dir
)
temp_path
=
File
.
join
(
dir_path
,
"job.log"
)
temp_file
&
.
close
FileUtils
.
copy
(
src_path
,
temp_path
)
yield
(
temp_file
.
path
)
yield
(
temp_path
)
ensure
end
temp_file
&
.
close
temp_file
&
.
unlink
end
end
end
end
end
end
Alain Takoudjou
@alain.takoudjou
mentioned in commit
8a56c5a1
·
Aug 21, 2018
mentioned in commit
8a56c5a1
mentioned in commit 8a56c5a1ac744a29a589c5a2ee1f26929f74105d
Toggle commit list
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