Browse Source

Skip FailedStorage in background scan

The background job that scans storages must skip failed storages to
avoid potential exceptions, especially when the failed storage comes
from a shared storage where the source is not accessible.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
tags/v12.0.0beta1
Vincent Petry 7 years ago
parent
commit
cbebfaaf2b
No account linked to committer's email address
1 changed files with 12 additions and 0 deletions
  1. 12
    0
      lib/private/Files/Utils/Scanner.php

+ 12
- 0
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'))

Loading…
Cancel
Save