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:
commit
106257733e
|
@ -38,15 +38,15 @@ use OCP\Comments\NotFoundException;
|
||||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
use OCP\ILogger;
|
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
class Manager implements ICommentsManager {
|
class Manager implements ICommentsManager {
|
||||||
|
|
||||||
/** @var IDBConnection */
|
/** @var IDBConnection */
|
||||||
protected $dbConn;
|
protected $dbConn;
|
||||||
|
|
||||||
/** @var ILogger */
|
/** @var LoggerInterface */
|
||||||
protected $logger;
|
protected $logger;
|
||||||
|
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
|
@ -64,16 +64,9 @@ class Manager implements ICommentsManager {
|
||||||
/** @var \Closure[] */
|
/** @var \Closure[] */
|
||||||
protected $displayNameResolvers = [];
|
protected $displayNameResolvers = [];
|
||||||
|
|
||||||
/**
|
|
||||||
* Manager constructor.
|
|
||||||
*
|
|
||||||
* @param IDBConnection $dbConn
|
|
||||||
* @param ILogger $logger
|
|
||||||
* @param IConfig $config
|
|
||||||
*/
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
IDBConnection $dbConn,
|
IDBConnection $dbConn,
|
||||||
ILogger $logger,
|
LoggerInterface $logger,
|
||||||
IConfig $config
|
IConfig $config
|
||||||
) {
|
) {
|
||||||
$this->dbConn = $dbConn;
|
$this->dbConn = $dbConn;
|
||||||
|
@ -693,7 +686,10 @@ class Manager implements ICommentsManager {
|
||||||
$affectedRows = $query->execute();
|
$affectedRows = $query->execute();
|
||||||
$this->uncache($id);
|
$this->uncache($id);
|
||||||
} catch (DriverException $e) {
|
} catch (DriverException $e) {
|
||||||
$this->logger->logException($e, ['app' => 'core_comments']);
|
$this->logger->error($e->getMessage(), [
|
||||||
|
'exception' => $e,
|
||||||
|
'app' => 'core_comments',
|
||||||
|
]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -918,7 +914,10 @@ class Manager implements ICommentsManager {
|
||||||
try {
|
try {
|
||||||
$affectedRows = $query->execute();
|
$affectedRows = $query->execute();
|
||||||
} catch (DriverException $e) {
|
} catch (DriverException $e) {
|
||||||
$this->logger->logException($e, ['app' => 'core_comments']);
|
$this->logger->error($e->getMessage(), [
|
||||||
|
'exception' => $e,
|
||||||
|
'app' => 'core_comments',
|
||||||
|
]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return ($affectedRows > 0);
|
return ($affectedRows > 0);
|
||||||
|
@ -1022,7 +1021,10 @@ class Manager implements ICommentsManager {
|
||||||
try {
|
try {
|
||||||
$affectedRows = $query->execute();
|
$affectedRows = $query->execute();
|
||||||
} catch (DriverException $e) {
|
} catch (DriverException $e) {
|
||||||
$this->logger->logException($e, ['app' => 'core_comments']);
|
$this->logger->error($e->getMessage(), [
|
||||||
|
'exception' => $e,
|
||||||
|
'app' => 'core_comments',
|
||||||
|
]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return ($affectedRows > 0);
|
return ($affectedRows > 0);
|
||||||
|
|
|
@ -28,6 +28,7 @@ namespace OC\Comments;
|
||||||
use OCP\Comments\ICommentsManager;
|
use OCP\Comments\ICommentsManager;
|
||||||
use OCP\Comments\ICommentsManagerFactory;
|
use OCP\Comments\ICommentsManagerFactory;
|
||||||
use OCP\IServerContainer;
|
use OCP\IServerContainer;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
class ManagerFactory implements ICommentsManagerFactory {
|
class ManagerFactory implements ICommentsManagerFactory {
|
||||||
|
|
||||||
|
@ -56,7 +57,7 @@ class ManagerFactory implements ICommentsManagerFactory {
|
||||||
public function getManager() {
|
public function getManager() {
|
||||||
return new Manager(
|
return new Manager(
|
||||||
$this->serverContainer->getDatabaseConnection(),
|
$this->serverContainer->getDatabaseConnection(),
|
||||||
$this->serverContainer->getLogger(),
|
$this->serverContainer->get(LoggerInterface::class),
|
||||||
$this->serverContainer->getConfig()
|
$this->serverContainer->getConfig()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue