mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Catch storage not available in versions expire command 

External storage with session credentials is not accessible without a
user session, hence background jobs and CLI commands can't work with
them. The previously unhandled exception causes logged errors in the
nextcloud log. This patch catches the specific exception and logs it as
warnings. So for a production instance the error won't spam their logs
for this non-recoverable and technically unsolvable error if the minimum
log level is set to the default of 3 (error).

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-11-25 09:28:38 +01:00
parent 48ef5148c1
commit 2e511e3ea0
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/files_versions/lib/Command/Expire.php
View File

@ -28,6 +28,8 @@ namespace OCA\Files_Versions\Command;
use OC\Command\FileAccess;
use OCA\Files_Versions\Storage;
use OCP\Command\ICommand;
use OCP\Files\StorageNotAvailableException;
use OCP\ILogger;
class Expire implements ICommand {
use FileAccess;
@ -59,6 +61,20 @@ class Expire implements ICommand {
return;
}
Storage::expire($this->fileName, $this->user);
try {
Storage::expire($this->fileName, $this->user);
} catch (StorageNotAvailableException $e) {
// In case of external storage and session credentials, the expiration
// fails because the command does not have those credentials
/** @var ILogger $logger */
$logger = \OC::$server->query(ILogger::class);
$logger->logException($e, [
'level' => ILogger::WARN,
'uid' => $this->user,
'fileName' => $this->fileName,
]);
}
}
}