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

Log exception 

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2019-02-06 20:39:15 +01:00 committed by Morris Jobke
parent 382495e26d
commit 11a27b247f
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Repair.php
View File

@ -149,7 +149,7 @@ class Repair implements IOutput {
new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()), new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()), new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()), new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache')), new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
]; ];
} }

13
lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
View File

@ -22,11 +22,11 @@ declare(strict_types=1);
namespace OC\Repair\NC16; namespace OC\Repair\NC16;
use OC\Files\AppData\AppData;
use OCP\Files\IAppData; use OCP\Files\IAppData;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IConfig; use OCP\IConfig;
use OCP\ILogger;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep; use OCP\Migration\IRepairStep;
@ -44,12 +44,16 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
/** @var IConfig */ /** @var IConfig */
private $config; private $config;
/** @var AppData */ /** @var IAppData */
private $appData; private $appData;
public function __construct(IConfig $config, IAppData $appData) { /** @var ILogger */
private $logger;
public function __construct(IConfig $config, IAppData $appData, ILogger $logger) {
$this->config = $config; $this->config = $config;
$this->appData = $appData; $this->appData = $appData;
$this->logger = $logger;
} }
public function getName(): string { public function getName(): string {
@ -78,7 +82,8 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
/** @var ISimpleFolder $folder */ /** @var ISimpleFolder $folder */
$folder->getFile('photo.')->delete(); $folder->getFile('photo.')->delete();
} catch (\Exception $e) { } catch (\Exception $e) {
$output->warning('Could not delete "photo." file in dav-photocache/' . $folder->getName()); $this->logger->logException($e);
$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
} }
} }
} }