Skip to content

Commit 805892f

Browse files
committed
fixup! Add logging to federation sync
1 parent 7a5f3a3 commit 805892f

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

apps/dav/lib/CardDAV/SyncService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedS
100100
// remote server revoked access to the address book, remove it
101101
$this->backend->deleteAddressBook($addressBookId);
102102
$this->logger->error('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
103-
throw $ex;
104103
}
104+
$this->logger->error('Client exception:', ['app' => 'dav', 'exception' => $ex]);
105+
throw $ex;
105106
}
106107

107108
// 3. apply changes

apps/federation/lib/SyncFederationAddressBooks.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ public function syncThemAll(\Closure $callback) {
9595
} catch (\Exception $ex) {
9696
if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
9797
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
98-
$this->logger->error('Server sync failed because of revoked access',['exception' => $ex] );
98+
$this->logger->error('Server sync failed because of revoked access.');
9999
} else {
100100
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_FAILURE);
101-
$this->logger->error('Server sync failed', ['exception' => $ex]);
101+
$this->logger->error('Server sync failed.');
102102
}
103103
$callback($url, $ex);
104104
}

apps/federation/lib/SyncJob.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,18 @@
2626
namespace OCA\Federation;
2727

2828
use OC\BackgroundJob\TimedJob;
29-
use OCP\ILogger;
3029
use Psr\Log\LoggerInterface;
3130

3231
class SyncJob extends TimedJob {
3332

3433
/** @var SyncFederationAddressBooks */
3534
protected $syncService;
3635

37-
/** @var ILogger */
36+
/** @var LoggerInterface */
3837
protected $logger;
3938

4039
/**
4140
* @param SyncFederationAddressBooks $syncService
42-
* @param ILogger $logger
4341
*/
4442
public function __construct(SyncFederationAddressBooks $syncService, LoggerInterface $logger) {
4543
// Run once a day

0 commit comments

Comments
 (0)