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:
authorBjoern Schiessle <bjoern@schiessle.org>2017-03-10 17:37:21 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2017-04-11 16:04:01 +0300
commit449011dae7ea0ec7eb8d6c78e89709982020e709 (patch)
treee102862917001ace40e23d7126973612cf7f2ac6 /apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php
parent0dea31d48bbd0361cca4d67b9de05a9f9ad3a198 (diff)
remove discovery manager in favour of the OCSDiscoveryService
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php')
-rw-r--r--apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php
index 2356c569d87..8d81d56802d 100644
--- a/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php
+++ b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php
@@ -27,7 +27,6 @@ namespace OCA\FederatedFileSharing\BackgroundJob;
use OC\BackgroundJob\Job;
use OC\BackgroundJob\JobList;
use OCA\FederatedFileSharing\AddressHandler;
-use OCA\FederatedFileSharing\DiscoveryManager;
use OCA\FederatedFileSharing\Notifications;
use OCP\BackgroundJob\IJobList;
use OCP\ILogger;
@@ -68,14 +67,10 @@ class RetryJob extends Job {
\OC::$server->getL10N('federatedfilesharing'),
\OC::$server->getCloudIdManager()
);
- $discoveryManager = new DiscoveryManager(
- \OC::$server->getMemCacheFactory(),
- \OC::$server->getHTTPClientService()
- );
$this->notifications = new Notifications(
$addressHandler,
\OC::$server->getHTTPClientService(),
- $discoveryManager,
+ \OC::$server->getOCSDiscoveryService(),
\OC::$server->getJobList()
);
}
@@ -108,7 +103,7 @@ class RetryJob extends Job {
$try = (int)$argument['try'] + 1;
$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
-
+
if ($result === true || $try > $this->maxTry) {
$this->retainJob = false;
}