From bec4b468c3512653802557b7e2844e511ba47e71 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 21 Apr 2017 11:29:01 +0200 Subject: [PATCH] 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 --- apps/federation/lib/BackgroundJob/GetSharedSecret.php | 2 +- 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 4a6e720ae2..b1367be952 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 60b22cd628..9123e37300 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;