diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-21 12:54:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 12:54:44 +0200 |
| commit | 3a2a87d25ed12cf14bfbcde28508959e45841035 (patch) | |
| tree | a6ea94aa09548584e16d39d64584a0650c071538 | |
| parent | e9b00f84b85e97283b83cf951f9bd262e627ae9a (diff) | |
| parent | bec4b468c3512653802557b7e2844e511ba47e71 (diff) | |
| download | nextcloud-server-3a2a87d25ed12cf14bfbcde28508959e45841035.tar.gz nextcloud-server-3a2a87d25ed12cf14bfbcde28508959e45841035.zip | |
Merge pull request #4418 from nextcloud/fix_3380
No need to log guzzle exception
| -rw-r--r-- | apps/federation/lib/BackgroundJob/GetSharedSecret.php | 2 | ||||
| -rw-r--r-- | apps/federation/lib/BackgroundJob/RequestSharedSecret.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index 4a6e720ae2c..b1367be9524 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -179,7 +179,7 @@ class GetSharedSecret extends Job{ if ($status === Http::STATUS_FORBIDDEN) { $this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']); } else { - $this->logger->logException($e, ['app' => 'federation']); + $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']); } } catch (\Exception $e) { $status = Http::STATUS_INTERNAL_SERVER_ERROR; diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index 60b22cd6283..9123e37300d 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -177,7 +177,7 @@ class RequestSharedSecret extends Job { if ($status === Http::STATUS_FORBIDDEN) { $this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']); } else { - $this->logger->logException($e, ['app' => 'federation']); + $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']); } } catch (\Exception $e) { $status = Http::STATUS_INTERNAL_SERVER_ERROR; |