Skip to content

Commit e2531f8

Browse files
come-nccome-nc
committed
Migrate dav application from ILogger to LoggerInterface
Signed-off-by: Côme Chilliet <[email protected]>
1 parent 49b650c commit e2531f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+199
-369
lines changed

‎apps/dav/lib/AppInfo/Application.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
use OCP\AppFramework\IAppContainer;
9090
use OCP\Calendar\IManager as ICalendarManager;
9191
use OCP\Contacts\IManager as IContactsManager;
92-
use OCP\ILogger;
9392
use OCP\IServerContainer;
9493
use OCP\IUser;
9594
use Psr\Container\ContainerInterface;
95+
use Psr\Log\LoggerInterface;
9696
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
9797
use Symfony\Component\EventDispatcher\GenericEvent;
9898
use Throwable;
@@ -113,7 +113,7 @@ public function register(IRegistrationContext $context): void {
113113

114114
return new PhotoCache(
115115
$server->getAppDataDir('dav-photocache'),
116-
$c->get(ILogger::class)
116+
$c->get(LoggerInterface::class)
117117
);
118118
});
119119

@@ -325,7 +325,7 @@ function (GenericEvent $event) use ($container, $serverContainer) {
325325
$job->run([]);
326326
$serverContainer->getJobList()->setLastRun($job);
327327
} catch (Exception $ex) {
328-
$serverContainer->getLogger()->logException($ex);
328+
$serverContainer->get(LoggerInterface::class)->error($ex->getMessage(), ['exception' => $ex]);
329329
}
330330
};
331331

@@ -379,13 +379,13 @@ private function setupCalendarProvider(ICalendarManager $calendarManager,
379379
}
380380

381381
public function registerCalendarReminders(NotificationProviderManager $manager,
382-
ILogger $logger): void {
382+
LoggerInterface $logger): void {
383383
try {
384384
$manager->registerProvider(AudioProvider::class);
385385
$manager->registerProvider(EmailProvider::class);
386386
$manager->registerProvider(PushProvider::class);
387387
} catch (Throwable $ex) {
388-
$logger->logException($ex);
388+
$logger->error($ex->getMessage(), ['exception' => $ex]);
389389
}
390390
}
391391
}

‎apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
use OCP\BackgroundJob\IJobList;
3333
use OCP\BackgroundJob\QueuedJob;
3434
use OCP\IDBConnection;
35-
use OCP\ILogger;
35+
use Psr\Log\LoggerInterface;
3636

3737
/**
3838
* Class BuildReminderIndexBackgroundJob
@@ -47,8 +47,7 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
4747
/** @var ReminderService */
4848
private $reminderService;
4949

50-
/** @var ILogger */
51-
private $logger;
50+
private LoggerInterface $logger;
5251

5352
/** @var IJobList */
5453
private $jobList;
@@ -58,16 +57,10 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
5857

5958
/**
6059
* BuildReminderIndexBackgroundJob constructor.
61-
*
62-
* @param IDBConnection $db
63-
* @param ReminderService $reminderService
64-
* @param ILogger $logger
65-
* @param IJobList $jobList
66-
* @param ITimeFactory $timeFactory
6760
*/
6861
public function __construct(IDBConnection $db,
6962
ReminderService $reminderService,
70-
ILogger $logger,
63+
LoggerInterface $logger,
7164
IJobList $jobList,
7265
ITimeFactory $timeFactory) {
7366
parent::__construct($timeFactory);
@@ -126,7 +119,7 @@ private function buildIndex(int $offset, int $stopAt):int {
126119
try {
127120
$this->reminderService->onCalendarObjectCreate($row);
128121
} catch (\Exception $ex) {
129-
$this->logger->logException($ex);
122+
$this->logger->error($ex->getMessage(), ['exception' => $ex]);
130123
}
131124

132125
if (($this->timeFactory->getTime() - $startTime) > 15) {

‎apps/dav/lib/CalDAV/CalDavBackend.php‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
use OCP\IConfig;
7070
use OCP\IDBConnection;
7171
use OCP\IGroupManager;
72-
use OCP\ILogger;
7372
use OCP\IUser;
7473
use OCP\IUserManager;
7574
use OCP\Security\ISecureRandom;
75+
use Psr\Log\LoggerInterface;
7676
use RuntimeException;
7777
use Sabre\CalDAV\Backend\AbstractBackend;
7878
use Sabre\CalDAV\Backend\SchedulingSupport;
@@ -220,8 +220,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
220220
/** @var ISecureRandom */
221221
private $random;
222222

223-
/** @var ILogger */
224-
private $logger;
223+
private LoggerInterface $logger;
225224

226225
/** @var IEventDispatcher */
227226
private $dispatcher;
@@ -240,23 +239,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
240239

241240
/**
242241
* CalDavBackend constructor.
243-
*
244-
* @param IDBConnection $db
245-
* @param Principal $principalBackend
246-
* @param IUserManager $userManager
247-
* @param IGroupManager $groupManager
248-
* @param ISecureRandom $random
249-
* @param ILogger $logger
250-
* @param IEventDispatcher $dispatcher
251-
* @param EventDispatcherInterface $legacyDispatcher
252-
* @param bool $legacyEndpoint
253242
*/
254243
public function __construct(IDBConnection $db,
255244
Principal $principalBackend,
256245
IUserManager $userManager,
257246
IGroupManager $groupManager,
258247
ISecureRandom $random,
259-
ILogger $logger,
248+
LoggerInterface $logger,
260249
IEventDispatcher $dispatcher,
261250
EventDispatcherInterface $legacyDispatcher,
262251
IConfig $config,
@@ -1715,15 +1704,15 @@ public function calendarQuery($calendarId, array $filters, $calendarType = self:
17151704
try {
17161705
$matches = $this->validateFilterForObject($row, $filters);
17171706
} catch (ParseException $ex) {
1718-
$this->logger->logException($ex, [
1707+
$this->logger->error('Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri'], [
17191708
'app' => 'dav',
1720-
'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
1709+
'exception' => $ex,
17211710
]);
17221711
continue;
17231712
} catch (InvalidDataException $ex) {
1724-
$this->logger->logException($ex, [
1713+
$this->logger->error('Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri'], [
17251714
'app' => 'dav',
1726-
'message' => 'Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
1715+
'exception' => $ex,
17271716
]);
17281717
continue;
17291718
}

‎apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace OCA\DAV\CalDAV\ICSExportPlugin;
2424

2525
use OCP\IConfig;
26-
use OCP\ILogger;
26+
use Psr\Log\LoggerInterface;
2727
use Sabre\HTTP\ResponseInterface;
2828
use Sabre\VObject\DateTimeParser;
2929
use Sabre\VObject\InvalidDataException;
@@ -39,18 +39,15 @@ class ICSExportPlugin extends \Sabre\CalDAV\ICSExportPlugin {
3939
/** @var IConfig */
4040
private $config;
4141

42-
/** @var ILogger */
43-
private $logger;
42+
private LoggerInterface $logger;
4443

4544
/** @var string */
4645
private const DEFAULT_REFRESH_INTERVAL = 'PT4H';
4746

4847
/**
4948
* ICSExportPlugin constructor.
50-
*
51-
* @param IConfig $config
5249
*/
53-
public function __construct(IConfig $config, ILogger $logger) {
50+
public function __construct(IConfig $config, LoggerInterface $logger) {
5451
$this->config = $config;
5552
$this->logger = $logger;
5653
}

‎apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
use OCA\DAV\CalDAV\Reminder\INotificationProvider;
3333
use OCP\IConfig;
3434
use OCP\IL10N;
35-
use OCP\ILogger;
3635
use OCP\IURLGenerator;
3736
use OCP\IUser;
3837
use OCP\L10N\IFactory as L10NFactory;
38+
use Psr\Log\LoggerInterface;
3939
use Sabre\VObject\Component\VEvent;
4040
use Sabre\VObject\DateTimeParser;
4141
use Sabre\VObject\Property;
@@ -50,8 +50,7 @@ abstract class AbstractProvider implements INotificationProvider {
5050
/** @var string */
5151
public const NOTIFICATION_TYPE = '';
5252

53-
/** @var ILogger */
54-
protected $logger;
53+
protected LoggerInterface $logger;
5554

5655
/** @var L10NFactory */
5756
protected $l10nFactory;
@@ -68,13 +67,7 @@ abstract class AbstractProvider implements INotificationProvider {
6867
/** @var IConfig */
6968
protected $config;
7069

71-
/**
72-
* @param ILogger $logger
73-
* @param L10NFactory $l10nFactory
74-
* @param IConfig $config
75-
* @param IUrlGenerator $urlGenerator
76-
*/
77-
public function __construct(ILogger $logger,
70+
public function __construct(LoggerInterface $logger,
7871
L10NFactory $l10nFactory,
7972
IURLGenerator $urlGenerator,
8073
IConfig $config) {

‎apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
use DateTime;
3535
use OCP\IConfig;
3636
use OCP\IL10N;
37-
use OCP\ILogger;
3837
use OCP\IURLGenerator;
3938
use OCP\L10N\IFactory as L10NFactory;
4039
use OCP\Mail\IEMailTemplate;
4140
use OCP\Mail\IMailer;
41+
use Psr\Log\LoggerInterface;
4242
use Sabre\VObject;
4343
use Sabre\VObject\Component\VEvent;
4444
use Sabre\VObject\Parameter;
@@ -57,16 +57,9 @@ class EmailProvider extends AbstractProvider {
5757
/** @var IMailer */
5858
private $mailer;
5959

60-
/**
61-
* @param IConfig $config
62-
* @param IMailer $mailer
63-
* @param ILogger $logger
64-
* @param L10NFactory $l10nFactory
65-
* @param IUrlGenerator $urlGenerator
66-
*/
6760
public function __construct(IConfig $config,
6861
IMailer $mailer,
69-
ILogger $logger,
62+
LoggerInterface $logger,
7063
L10NFactory $l10nFactory,
7164
IURLGenerator $urlGenerator) {
7265
parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
@@ -133,7 +126,7 @@ public function send(VEvent $vevent,
133126
$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
134127
}
135128
} catch (\Exception $ex) {
136-
$this->logger->logException($ex, ['app' => 'dav']);
129+
$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
137130
}
138131
}
139132
}

‎apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
use OCA\DAV\AppInfo\Application;
3333
use OCP\AppFramework\Utility\ITimeFactory;
3434
use OCP\IConfig;
35-
use OCP\ILogger;
3635
use OCP\IURLGenerator;
3736
use OCP\IUser;
3837
use OCP\L10N\IFactory as L10NFactory;
3938
use OCP\Notification\IManager;
4039
use OCP\Notification\INotification;
40+
use Psr\Log\LoggerInterface;
4141
use Sabre\VObject\Component\VEvent;
4242
use Sabre\VObject\Property;
4343

@@ -57,17 +57,9 @@ class PushProvider extends AbstractProvider {
5757
/** @var ITimeFactory */
5858
private $timeFactory;
5959

60-
/**
61-
* @param IConfig $config
62-
* @param IManager $manager
63-
* @param ILogger $logger
64-
* @param L10NFactory $l10nFactory
65-
* @param IUrlGenerator $urlGenerator
66-
* @param ITimeFactory $timeFactory
67-
*/
6860
public function __construct(IConfig $config,
6961
IManager $manager,
70-
ILogger $logger,
62+
LoggerInterface $logger,
7163
L10NFactory $l10nFactory,
7264
IURLGenerator $urlGenerator,
7365
ITimeFactory $timeFactory) {

‎apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
use OCP\DB\QueryBuilder\IQueryBuilder;
3434
use OCP\IDBConnection;
3535
use OCP\IGroupManager;
36-
use OCP\ILogger;
3736
use OCP\IUserSession;
37+
use Psr\Log\LoggerInterface;
3838
use Sabre\DAV\PropPatch;
3939
use Sabre\DAVACL\PrincipalBackend\BackendInterface;
4040
use function array_intersect;
@@ -54,8 +54,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
5454
/** @var IGroupManager */
5555
private $groupManager;
5656

57-
/** @var ILogger */
58-
private $logger;
57+
private LoggerInterface $logger;
5958

6059
/** @var ProxyMapper */
6160
private $proxyMapper;
@@ -75,19 +74,10 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
7574
/** @var string */
7675
private $cuType;
7776

78-
/**
79-
* @param IDBConnection $dbConnection
80-
* @param IUserSession $userSession
81-
* @param IGroupManager $groupManager
82-
* @param ILogger $logger
83-
* @param string $principalPrefix
84-
* @param string $dbPrefix
85-
* @param string $cuType
86-
*/
8777
public function __construct(IDBConnection $dbConnection,
8878
IUserSession $userSession,
8979
IGroupManager $groupManager,
90-
ILogger $logger,
80+
LoggerInterface $logger,
9181
ProxyMapper $proxyMapper,
9282
string $principalPrefix,
9383
string $dbPrefix,

‎apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
2626
use OCP\IDBConnection;
2727
use OCP\IGroupManager;
28-
use OCP\ILogger;
2928
use OCP\IUserSession;
29+
use Psr\Log\LoggerInterface;
3030

3131
/**
3232
* Class ResourcePrincipalBackend
@@ -37,17 +37,11 @@ class ResourcePrincipalBackend extends AbstractPrincipalBackend {
3737

3838
/**
3939
* ResourcePrincipalBackend constructor.
40-
*
41-
* @param IDBConnection $dbConnection
42-
* @param IUserSession $userSession
43-
* @param IGroupManager $groupManager
44-
* @param ILogger $logger
45-
* @param ProxyMapper $proxyMapper
4640
*/
4741
public function __construct(IDBConnection $dbConnection,
4842
IUserSession $userSession,
4943
IGroupManager $groupManager,
50-
ILogger $logger,
44+
LoggerInterface $logger,
5145
ProxyMapper $proxyMapper) {
5246
parent::__construct($dbConnection, $userSession, $groupManager, $logger,
5347
$proxyMapper, 'principals/calendar-resources', 'resource', 'RESOURCE');

‎apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
2626
use OCP\IDBConnection;
2727
use OCP\IGroupManager;
28-
use OCP\ILogger;
2928
use OCP\IUserSession;
29+
use Psr\Log\LoggerInterface;
3030

3131
/**
3232
* Class RoomPrincipalBackend
@@ -37,17 +37,11 @@ class RoomPrincipalBackend extends AbstractPrincipalBackend {
3737

3838
/**
3939
* RoomPrincipalBackend constructor.
40-
*
41-
* @param IDBConnection $dbConnection
42-
* @param IUserSession $userSession
43-
* @param IGroupManager $groupManager
44-
* @param ILogger $logger
45-
* @param ProxyMapper $proxyMapper
4640
*/
4741
public function __construct(IDBConnection $dbConnection,
4842
IUserSession $userSession,
4943
IGroupManager $groupManager,
50-
ILogger $logger,
44+
LoggerInterface $logger,
5145
ProxyMapper $proxyMapper) {
5246
parent::__construct($dbConnection, $userSession, $groupManager, $logger,
5347
$proxyMapper, 'principals/calendar-rooms', 'room', 'ROOM');

0 commit comments

Comments
 (0)