diff options
| author | mbi <knox@users.noreply.github.com> | 2015-12-30 10:34:42 +0100 |
|---|---|---|
| committer | mbi <knox@users.noreply.github.com> | 2015-12-30 10:34:42 +0100 |
| commit | 63974992f9a0244df0bbff891956deec7d35904b (patch) | |
| tree | a4152551e4a4366957e06572cf04e4e0e941f38f /apps/federation/backgroundjob/getsharedsecret.php | |
| parent | 1aff941be6ea3c09e86e234b7e2dc77fe4aa3696 (diff) | |
| parent | 45c41e2b2cefa97c9d8c3bc73cfc088839640d1d (diff) | |
| download | nextcloud-server-63974992f9a0244df0bbff891956deec7d35904b.tar.gz nextcloud-server-63974992f9a0244df0bbff891956deec7d35904b.zip | |
Merge branch 'master' into master
Diffstat (limited to 'apps/federation/backgroundjob/getsharedsecret.php')
| -rw-r--r-- | apps/federation/backgroundjob/getsharedsecret.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php index eb55fa2d6ab..8aa8a08e07b 100644 --- a/apps/federation/backgroundjob/getsharedsecret.php +++ b/apps/federation/backgroundjob/getsharedsecret.php @@ -91,7 +91,7 @@ class GetSharedSecret extends QueuedJob{ $this->trustedServers = new TrustedServers( $this->dbHandler, \OC::$server->getHTTPClientService(), - \OC::$server->getLogger(), + $this->logger, $this->jobList, \OC::$server->getSecureRandom(), \OC::$server->getConfig() @@ -148,6 +148,7 @@ class GetSharedSecret extends QueuedJob{ } catch (ClientException $e) { $status = $e->getCode(); + $this->logger->logException($e); } // if we received a unexpected response we try again later |