diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-02-08 10:16:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 10:16:54 +0100 |
| commit | cd15c30619d12e6161f9c8e6c1fd70be82324686 (patch) | |
| tree | 42a4db705f16ad2fbcbfaf35659544dda80fbc51 | |
| parent | 736c9d7b1e9b99f0b32020de2ea218c18b65406a (diff) | |
| parent | 00b9002785ab5690a10a16fe8177ade63e9f6275 (diff) | |
| download | nextcloud-server-cd15c30619d12e6161f9c8e6c1fd70be82324686.tar.gz nextcloud-server-cd15c30619d12e6161f9c8e6c1fd70be82324686.zip | |
Merge pull request #43420 from nextcloud/backport/41015/stable27
[stable27] continue background scanning different storages if one fails
| -rw-r--r-- | lib/private/Files/Utils/Scanner.php | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index 277ce38175f..4d4c8a63d9e 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -156,33 +156,37 @@ class Scanner extends PublicEmitter { public function backgroundScan($dir) { $mounts = $this->getMounts($dir); foreach ($mounts as $mount) { - $storage = $mount->getStorage(); - if (is_null($storage)) { - continue; - } + try { + $storage = $mount->getStorage(); + if (is_null($storage)) { + continue; + } - // don't bother scanning failed storages (shortcut for same result) - if ($storage->instanceOfStorage(FailedStorage::class)) { - continue; - } + // don't bother scanning failed storages (shortcut for same result) + if ($storage->instanceOfStorage(FailedStorage::class)) { + continue; + } - $scanner = $storage->getScanner(); - $this->attachListener($mount); + $scanner = $storage->getScanner(); + $this->attachListener($mount); - $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) { - $this->triggerPropagator($storage, $path); - }); - $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) { - $this->triggerPropagator($storage, $path); - }); - $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) { - $this->triggerPropagator($storage, $path); - }); + $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); + $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); + $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); - $propagator = $storage->getPropagator(); - $propagator->beginBatch(); - $scanner->backgroundScan(); - $propagator->commitBatch(); + $propagator = $storage->getPropagator(); + $propagator->beginBatch(); + $scanner->backgroundScan(); + $propagator->commitBatch(); + } catch (\Exception $e) { + $this->logger->error("Error while trying to scan mount as {$mount->getMountPoint()}:" . $e->getMessage(), ['exception' => $e, 'app' => 'files']); + } } } |