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:
Diffstat (limited to 'lib/backup/database.rb')
-rw-r--r--lib/backup/database.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index 6c0029df27f..e3686947164 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -70,9 +70,9 @@ module Backup
success = $?.success? && status.success?
if errors.present?
- progress.print "------ BEGIN ERRORS -----".color(:yellow)
+ progress.print "------ BEGIN ERRORS -----\n".color(:yellow)
progress.print errors.join.color(:yellow)
- progress.print "------ END ERRORS -------".color(:yellow)
+ progress.print "------ END ERRORS -------\n".color(:yellow)
end
report_success(success)
@@ -89,12 +89,12 @@ module Backup
Open3.popen3(ENV, *cmd) do |stdin, stdout, stderr, thread|
stdin.binmode
- Thread.new do
+ out_reader = Thread.new do
data = stdout.read
$stdout.write(data)
end
- Thread.new do
+ err_reader = Thread.new do
until (raw_line = stderr.gets).nil?
warn(raw_line)
# Recent database dumps will use --if-exists with pg_dump
@@ -108,8 +108,7 @@ module Backup
end
stdin.close
-
- thread.join
+ [thread, out_reader, err_reader].each(&:join)
[thread.value, errors]
end
end