Merge pull request #4418 from nextcloud/fix_3380
No need to log guzzle exception
This commit is contained in:
commit
3a2a87d25e
|
@ -179,7 +179,7 @@ class GetSharedSecret extends Job{
|
||||||
if ($status === Http::STATUS_FORBIDDEN) {
|
if ($status === Http::STATUS_FORBIDDEN) {
|
||||||
$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
|
$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
|
||||||
} else {
|
} else {
|
||||||
$this->logger->logException($e, ['app' => 'federation']);
|
$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$status = Http::STATUS_INTERNAL_SERVER_ERROR;
|
$status = Http::STATUS_INTERNAL_SERVER_ERROR;
|
||||||
|
|
|
@ -177,7 +177,7 @@ class RequestSharedSecret extends Job {
|
||||||
if ($status === Http::STATUS_FORBIDDEN) {
|
if ($status === Http::STATUS_FORBIDDEN) {
|
||||||
$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
|
$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
|
||||||
} else {
|
} else {
|
||||||
$this->logger->logException($e, ['app' => 'federation']);
|
$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$status = Http::STATUS_INTERNAL_SERVER_ERROR;
|
$status = Http::STATUS_INTERNAL_SERVER_ERROR;
|
||||||
|
|
Loading…
Reference in New Issue