Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/text.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2022-07-15 00:38:09 +0300
committerVinicius Reis <vinicius.reis@nextcloud.com>2022-07-18 18:46:23 +0300
commit7739cab6534e0211df495e96b7d4ec34a8582fb4 (patch)
tree5e48a6cf3972df85f59ef62bb092b91e3ab987e3 /lib/Service/DocumentService.php
parentd27e2e0e6d3f85eee60165335c300f30ca878356 (diff)
Move to LoggerInterface
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/Service/DocumentService.php')
-rw-r--r--lib/Service/DocumentService.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
index 31ba17629..84f3b1a0b 100644
--- a/lib/Service/DocumentService.php
+++ b/lib/Service/DocumentService.php
@@ -40,6 +40,7 @@ use OCP\Files\Lock\OwnerLockedException;
use OCP\IRequest;
use OCP\Lock\ILockingProvider;
use OCP\PreConditionNotMetException;
+use Psr\Log\LoggerInterface;
use function json_encode;
use OCA\Text\Db\Document;
use OCA\Text\Db\DocumentMapper;
@@ -62,7 +63,6 @@ use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\ICache;
use OCP\ICacheFactory;
-use OCP\ILogger;
use OCP\Lock\LockedException;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as ShareManager;
@@ -77,7 +77,7 @@ class DocumentService {
private ?string $userId;
private DocumentMapper $documentMapper;
private SessionMapper $sessionMapper;
- private ILogger $logger;
+ private LoggerInterface $logger;
private ShareManager $shareManager;
private StepMapper $stepMapper;
private IRootFolder $rootFolder;
@@ -85,9 +85,9 @@ class DocumentService {
private IAppData $appData;
private ILockingProvider $lockingProvider;
private ILockManager $lockManager;
- private $userMountCache;
+ private IUserMountCache $userMountCache;
- public function __construct(DocumentMapper $documentMapper, StepMapper $stepMapper, SessionMapper $sessionMapper, IAppData $appData, $userId, IRootFolder $rootFolder, ICacheFactory $cacheFactory, ILogger $logger, ShareManager $shareManager, IRequest $request, IManager $directManager, ILockingProvider $lockingProvider, ILockManager $lockManager, IUserMountCache $userMountCache) {
+ public function __construct(DocumentMapper $documentMapper, StepMapper $stepMapper, SessionMapper $sessionMapper, IAppData $appData, $userId, IRootFolder $rootFolder, ICacheFactory $cacheFactory, LoggerInterface $logger, ShareManager $shareManager, IRequest $request, IManager $directManager, ILockingProvider $lockingProvider, ILockManager $lockManager, IUserMountCache $userMountCache) {
$this->documentMapper = $documentMapper;
$this->stepMapper = $stepMapper;
$this->sessionMapper = $sessionMapper;
@@ -228,7 +228,7 @@ class DocumentService {
throw $e;
} catch (\Throwable $e) {
if ($document !== null && $oldVersion !== null) {
- $this->logger->logException($e, ['message' => 'This should never happen. An error occured when storing the version, trying to recover the last stable one']);
+ $this->logger->error('This should never happen. An error occurred when storing the version, trying to recover the last stable one', ['exception' => $e]);
$document->setCurrentVersion($oldVersion);
$this->documentMapper->update($document);
$this->cache->set('document-version-' . $document->getId(), $oldVersion);
@@ -507,7 +507,7 @@ class DocumentService {
$this->appData->newFolder('documents');
} catch (\RuntimeException $e) {
// Do not fail hard
- $this->logger->logException($e);
+ $this->logger->error($e->getMessage(), ['exception' => $e]);
return false;
}