Merge pull request #26591 from nextcloud/techdebt/noid/less-ilogger

Less ILogger

3 files changed, 14 insertions, 13 deletions

diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php
index f675cece99e..3d118989cc6 100644
--- a/lib/private/Collaboration/Collaborators/LookupPlugin.php
+++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php
@@ -33,9 +33,9 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
-use OCP\ILogger;
 use OCP\IUserSession;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 
 class LookupPlugin implements ISearchPlugin {
 
@@ -47,14 +47,14 @@ class LookupPlugin implements ISearchPlugin {
 	private $currentUserRemote;
 	/** @var ICloudIdManager */
 	private $cloudIdManager;
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	private $logger;
 
 	public function __construct(IConfig $config,
 								IClientService $clientService,
 								IUserSession $userSession,
 								ICloudIdManager $cloudIdManager,
-								ILogger $logger) {
+								LoggerInterface $logger) {
 		$this->config = $config;
 		$this->clientService = $clientService;
 		$this->cloudIdManager = $cloudIdManager;
@@ -96,8 +96,9 @@ class LookupPlugin implements ISearchPlugin {
 				try {
 					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
 				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"');
-					$this->logger->error($e->getMessage());
+					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"', [
+						'exception' => $e,
+					]);
 					continue;
 				}
 				if ($this->currentUserRemote === $remote) {
diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php
index 97213c45669..a84ca4da241 100644
--- a/lib/private/Collaboration/Resources/Manager.php
+++ b/lib/private/Collaboration/Resources/Manager.php
@@ -38,8 +38,8 @@ use OCP\Collaboration\Resources\IResource;
 use OCP\Collaboration\Resources\ResourceException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
 	public const TABLE_COLLECTIONS = 'collres_collections';
@@ -50,14 +50,14 @@ class Manager implements IManager {
 	protected $connection;
 	/** @var IProviderManager */
 	protected $providerManager;
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	protected $logger;
 
 	/** @var string[] */
 	protected $providers = [];
 
 
-	public function __construct(IDBConnection $connection, IProviderManager $providerManager, ILogger $logger) {
+	public function __construct(IDBConnection $connection, IProviderManager $providerManager, LoggerInterface $logger) {
 		$this->connection = $connection;
 		$this->providerManager = $providerManager;
 		$this->logger = $logger;
diff --git a/lib/private/Collaboration/Resources/ProviderManager.php b/lib/private/Collaboration/Resources/ProviderManager.php
index 095ffdcd8ee..71e7d8b7e2e 100644
--- a/lib/private/Collaboration/Resources/ProviderManager.php
+++ b/lib/private/Collaboration/Resources/ProviderManager.php
@@ -29,8 +29,8 @@ namespace OC\Collaboration\Resources;
 use OCP\AppFramework\QueryException;
 use OCP\Collaboration\Resources\IProvider;
 use OCP\Collaboration\Resources\IProviderManager;
-use OCP\ILogger;
 use OCP\IServerContainer;
+use Psr\Log\LoggerInterface;
 
 class ProviderManager implements IProviderManager {
 
@@ -43,10 +43,10 @@ class ProviderManager implements IProviderManager {
 	/** @var IServerContainer */
 	protected $serverContainer;
 
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	protected $logger;
 
-	public function __construct(IServerContainer $serverContainer, ILogger $logger) {
+	public function __construct(IServerContainer $serverContainer, LoggerInterface $logger) {
 		$this->serverContainer = $serverContainer;
 		$this->logger = $logger;
 	}
@@ -57,8 +57,8 @@ class ProviderManager implements IProviderManager {
 				try {
 					$this->providerInstances[] = $this->serverContainer->query($provider);
 				} catch (QueryException $e) {
-					$this->logger->logException($e, [
-						'message' => "Could not query resource provider $provider: " . $e->getMessage()
+					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
+						'exception' => $e,
 					]);
 				}
 			}