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

Merge pull request #23244 from nextcloud/techdebt/noid/user-psr-logger-interface-in-comments 

Use PSR logger interface in comments manager
This commit is contained in:
Roeland Jago Douma 2020-10-07 10:58:54 +02:00 committed by GitHub
parent 678ef8466d 17454f6ce9
commit 106257733e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/private/Comments/Manager.php
View File

@ -38,15 +38,15 @@ use OCP\Comments\NotFoundException;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IUser;
use Psr\Log\LoggerInterface;
class Manager implements ICommentsManager {
/** @var IDBConnection */
protected $dbConn;
/** @var ILogger */
/** @var LoggerInterface */
protected $logger;
/** @var IConfig */
@ -64,16 +64,9 @@ class Manager implements ICommentsManager {
/** @var \Closure[] */
protected $displayNameResolvers = [];
/**
* Manager constructor.
*
* @param IDBConnection $dbConn
* @param ILogger $logger
* @param IConfig $config
*/
public function __construct(
IDBConnection $dbConn,
ILogger $logger,
LoggerInterface $logger,
IConfig $config
) {
$this->dbConn = $dbConn;
@ -693,7 +686,10 @@ class Manager implements ICommentsManager {
$affectedRows = $query->execute();
$this->uncache($id);
} catch (DriverException $e) {
$this->logger->logException($e, ['app' => 'core_comments']);
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
]);
return false;
}
@ -918,7 +914,10 @@ class Manager implements ICommentsManager {
try {
$affectedRows = $query->execute();
} catch (DriverException $e) {
$this->logger->logException($e, ['app' => 'core_comments']);
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
]);
return false;
}
return ($affectedRows > 0);
@ -1022,7 +1021,10 @@ class Manager implements ICommentsManager {
try {
$affectedRows = $query->execute();
} catch (DriverException $e) {
$this->logger->logException($e, ['app' => 'core_comments']);
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
]);
return false;
}
return ($affectedRows > 0);

3
lib/private/Comments/ManagerFactory.php
View File

@ -28,6 +28,7 @@ namespace OC\Comments;
use OCP\Comments\ICommentsManager;
use OCP\Comments\ICommentsManagerFactory;
use OCP\IServerContainer;
use Psr\Log\LoggerInterface;
class ManagerFactory implements ICommentsManagerFactory {
@ -56,7 +57,7 @@ class ManagerFactory implements ICommentsManagerFactory {
public function getManager() {
return new Manager(
$this->serverContainer->getDatabaseConnection(),
$this->serverContainer->getLogger(),
$this->serverContainer->get(LoggerInterface::class),
$this->serverContainer->getConfig()
);
}