wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4418 from nextcloud/fix_3380

Browse source 
No need to log guzzle exception
This commit is contained in:
Roeland Jago Douma 2017-04-21 12:54:44 +02:00 committed by GitHub
commit 3a2a87d25e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/federation/lib/BackgroundJob/GetSharedSecret.php
View file

@ -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;

2
apps/federation/lib/BackgroundJob/RequestSharedSecret.php
View file

@ -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;