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
committermultiple creatures <dev@multiple-creature.party>2020-04-04 12:23:52 -0500
commitd3e681911bd043c3d6e857c1bb763d3281a23881 (patch)
treefc51e7d38100503c70ab63025fde518ea37c50d9 /app/services/backup_service.rb
parent26e82ebc5453f5c61674cecbc26005bb43d80ae3 (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 0b57b6d0c..ab6d090a0 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -166,7 +166,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