summaryrefslogtreecommitdiffstats
path: root/apps/federation
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-04-21 11:29:01 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2017-04-21 11:29:01 +0200
commitbec4b468c3512653802557b7e2844e511ba47e71 (patch)
treea6ea94aa09548584e16d39d64584a0650c071538 /apps/federation
parente9b00f84b85e97283b83cf951f9bd262e627ae9a (diff)
downloadnextcloud-server-bec4b468c3512653802557b7e2844e511ba47e71.tar.gz
nextcloud-server-bec4b468c3512653802557b7e2844e511ba47e71.zip
No need to log guzzle exception
When getting/requesting a shared secret there is no need to log the full exception when an unexpected status code is returned since this won't really tell us anything as the bad stuff happened on a remote server Fixes #3380 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/federation')
-rw-r--r--apps/federation/lib/BackgroundJob/GetSharedSecret.php2
-rw-r--r--apps/federation/lib/BackgroundJob/RequestSharedSecret.php2
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;