gearheads
/
mastodon
Archived
2
0
Fork 0

Fix backups stopping due to read timeouts (#12281)

* Make BackupService resilient to read timeouts

If an attachment read times out, assume that the resources is
inaccessible and continue the backup without it. This fixes #12280.

* Both errors on one line
gh/stable
chr v1.x 2019-12-29 18:17:54 -08:00 committed by Eugen Rochko
parent 7a81346d55
commit 7e074610a6
1 changed files with 1 additions and 1 deletions

View File

@ -165,7 +165,7 @@ class BackupService < BaseService
io.write(buffer) io.write(buffer)
end end
end end
rescue Errno::ENOENT rescue Errno::ENOENT, Seahorse::Client::NetworkingError
Rails.logger.warn "Could not backup file #{filename}: file not found" Rails.logger.warn "Could not backup file #{filename}: file not found"
end end
end end