From f69e5a4d7ee04862c3cfe09e233203759ad2d187 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Tue, 30 Jun 2020 16:52:37 +0200 Subject: [PATCH] FIX: Sometimes not all output of psql was logged during restores There was a race condition which could prevent Discourse from logging the last couple of lines of output from psql. --- lib/backup_restore/database_restorer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb index 9ccb6a5f15..40c1459f9d 100644 --- a/lib/backup_restore/database_restorer.rb +++ b/lib/backup_restore/database_restorer.rb @@ -70,7 +70,7 @@ module BackupRestore log_thread = Thread.new do RailsMultisite::ConnectionManagement::establish_connection(db: @current_db) - while psql_running + while psql_running || !logs.empty? message = logs.pop.strip log(message) if message.present? end