about summary refs log tree commit diff
path: root/app/services/backup_service.rb
diff options
context:
space:
mode:
authorchr v1.x <chr@cybre.space>2019-12-29 18:17:54 -0800
committerEugen Rochko <eugen@zeonfederated.com>2019-12-30 03:17:54 +0100
commit7e074610a6651d499267e976f45aadce8cd60d96 (patch)
treee8399ee24585bde9e856219c31bacefce0740ace /app/services/backup_service.rb
parent7a81346d5557053425bc8cf942b05eff0e93fe15 (diff)
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
Diffstat (limited to 'app/services/backup_service.rb')
-rw-r--r--app/services/backup_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index fba2d19a0..d1090dff1 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -165,7 +165,7 @@ class BackupService < BaseService
         io.write(buffer)
       end
     end
-  rescue Errno::ENOENT
+  rescue Errno::ENOENT, Seahorse::Client::NetworkingError
     Rails.logger.warn "Could not backup file #{filename}: file not found"
   end
 end