diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-11-29 13:06:32 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-11-29 13:06:32 +0100 |
| commit | 79554a29e02120121c541206e427ce5dff52e693 (patch) | |
| tree | 59221a71b502ca64e7ed8c4ac0b3b6f6f738db75 /apps/federation | |
| parent | 095eba0aa3b90ed0400864f2d6c086e2ab663e9b (diff) | |
| download | nextcloud-server-79554a29e02120121c541206e427ce5dff52e693.tar.gz nextcloud-server-79554a29e02120121c541206e427ce5dff52e693.zip | |
Do not log Exception if a connection error occured
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/federation')
| -rw-r--r-- | apps/federation/lib/BackgroundJob/GetSharedSecret.php | 3 | ||||
| -rw-r--r-- | apps/federation/lib/BackgroundJob/RequestSharedSecret.php | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index a3b087e12f8..0c621aa40ea 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -31,6 +31,7 @@ namespace OCA\Federation\BackgroundJob; use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\Exception\ConnectException; use OC\BackgroundJob\JobList; use OC\BackgroundJob\Job; use OCA\Federation\DbHandler; @@ -196,6 +197,8 @@ class GetSharedSecret extends Job { } else { $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']); } + } catch (ConnectException $e) { + $this->logger->info('Could not connect to ' . $target, ['app' => 'federation']); } catch (\Exception $e) { $status = Http::STATUS_INTERNAL_SERVER_ERROR; $this->logger->logException($e, ['app' => 'federation']); diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index 0ba4e37f759..09de76cba95 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -32,6 +32,7 @@ namespace OCA\Federation\BackgroundJob; use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\Exception\ConnectException; use OC\BackgroundJob\JobList; use OC\BackgroundJob\Job; use OCA\Federation\DbHandler; @@ -196,6 +197,8 @@ class RequestSharedSecret extends Job { } else { $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']); } + } catch (ConnectException $e) { + $this->logger->info('Could not connect to ' . $target, ['app' => 'federation']); } catch (\Exception $e) { $status = Http::STATUS_INTERNAL_SERVER_ERROR; $this->logger->logException($e, ['app' => 'federation']); |