upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-28 17:48:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

Merge pull request #3885 from nextcloud/downstream-26529

Browse source 
Skip FailedStorage in background scan
This commit is contained in:
Joas Schilling 2017-03-17 10:06:58 +01:00 committed by GitHub
commit e548d27d3a
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Files/Utils/Scanner.php
View file

@ -123,6 +123,12 @@ class Scanner extends PublicEmitter {
if (is_null($storage)) {
continue;
}
// don't bother scanning failed storages (shortcut for same result)
if ($storage->instanceOfStorage('OC\Files\Storage\FailedStorage')) {
continue;
}
// don't scan the root storage
if ($storage->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
continue;
@ -166,6 +172,12 @@ class Scanner extends PublicEmitter {
if (is_null($storage)) {
continue;
}
// don't bother scanning failed storages (shortcut for same result)
if ($storage->instanceOfStorage('OC\Files\Storage\FailedStorage')) {
continue;
}
// if the home storage isn't writable then the scanner is run as the wrong user
if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
(!$storage->isCreatable('') or !$storage->isCreatable('files'))