Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2021-03-22 23:21:53 +0300
committerGitHub <noreply@github.com>2021-03-22 23:21:53 +0300
commit1eb084cfd37875adfe37301dcef7801634f7e28a (patch)
tree21855a42c198da8206df0a766d1983a3e12344de /apps/federatedfilesharing/lib
parent268acd301dafa90917e30cea8370b9cc27b7a2c6 (diff)
parent2dac72ddea918c01495ba78e61cb1daf83daf33a (diff)
Merge pull request #25498 from Worteks/feat-federatedfilesharing-logging
feat(federatedfilesharing): log errors, as suggested by @maxbes
Diffstat (limited to 'apps/federatedfilesharing/lib')
-rw-r--r--apps/federatedfilesharing/lib/Notifications.php31
1 files changed, 31 insertions, 0 deletions
diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php
index 4689f048d85..68acfc98f8b 100644
--- a/apps/federatedfilesharing/lib/Notifications.php
+++ b/apps/federatedfilesharing/lib/Notifications.php
@@ -35,6 +35,7 @@ use OCP\Federation\ICloudFederationFactory;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Http\Client\IClientService;
use OCP\OCS\IDiscoveryService;
+use OCP\ILogger;
class Notifications {
public const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
@@ -60,10 +61,14 @@ class Notifications {
/** @var IEventDispatcher */
private $eventDispatcher;
+ /** @var ILogger */
+ private $logger;
+
public function __construct(
AddressHandler $addressHandler,
IClientService $httpClientService,
IDiscoveryService $discoveryService,
+ ILogger $logger,
IJobList $jobList,
ICloudFederationProviderManager $federationProviderManager,
ICloudFederationFactory $cloudFederationFactory,
@@ -73,6 +78,7 @@ class Notifications {
$this->httpClientService = $httpClientService;
$this->discoveryService = $discoveryService;
$this->jobList = $jobList;
+ $this->logger = $logger;
$this->federationProviderManager = $federationProviderManager;
$this->cloudFederationFactory = $cloudFederationFactory;
$this->eventDispatcher = $eventDispatcher;
@@ -123,7 +129,17 @@ class Notifications {
$event = new FederatedShareAddedEvent($remote);
$this->eventDispatcher->dispatchTyped($event);
return true;
+ } else {
+ $this->logger->info(
+ "failed sharing $name with $shareWith",
+ ['app' => 'federatedfilesharing']
+ );
}
+ } else {
+ $this->logger->info(
+ "could not share $name, invalid contact $shareWith",
+ ['app' => 'federatedfilesharing']
+ );
}
return false;
@@ -174,6 +190,21 @@ class Notifications {
$status['ocs']['data']['token'],
$status['ocs']['data']['remoteId']
];
+ } elseif (!$validToken) {
+ $this->logger->info(
+ "invalid or missing token requesting re-share for $filename to $remote",
+ ['app' => 'federatedfilesharing']
+ );
+ } elseif (!$validRemoteId) {
+ $this->logger->info(
+ "missing remote id requesting re-share for $filename to $remote",
+ ['app' => 'federatedfilesharing']
+ );
+ } else {
+ $this->logger->info(
+ "failed requesting re-share for $filename to $remote",
+ ['app' => 'federatedfilesharing']
+ );
}
return false;