From 7e074610a6651d499267e976f45aadce8cd60d96 Mon Sep 17 00:00:00 2001
From: "chr v1.x" <chr@cybre.space>
Date: Sun, 29 Dec 2019 18:17:54 -0800
Subject: [PATCH] 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
---
 app/services/backup_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index fba2d19a08b..d1090dff1b8 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