summaryrefslogtreecommitdiffstats
path: root/apps/federation
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2016-02-01 13:39:13 +0100
committerBjörn Schießle <bjoern@schiessle.org>2016-02-01 13:39:13 +0100
commit2d469e39af2c63075a13a38b5129ed0a9044d3ee (patch)
tree2295faf9ad5b7dee27f3b455ecfa754975ee4b45 /apps/federation
parent8e3fcb120f25f69710576dfc6bffccc6366ca9c0 (diff)
downloadnextcloud-server-2d469e39af2c63075a13a38b5129ed0a9044d3ee.tar.gz
nextcloud-server-2d469e39af2c63075a13a38b5129ed0a9044d3ee.zip
catch all exceptions
Diffstat (limited to 'apps/federation')
-rw-r--r--apps/federation/backgroundjob/getsharedsecret.php3
-rw-r--r--apps/federation/backgroundjob/requestsharedsecret.php3
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index cae446f915c..a98a17e323b 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -151,6 +151,9 @@ class GetSharedSecret extends QueuedJob{
} catch (ClientException $e) {
$status = $e->getCode();
$this->logger->logException($e);
+ } catch (\Exception $e) {
+ $status = HTTP::STATUS_INTERNAL_SERVER_ERROR;
+ $this->logger->logException($e);
}
// if we received a unexpected response we try again later
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index 92305b7e8ea..2db5d09545a 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -149,6 +149,9 @@ class RequestSharedSecret extends QueuedJob {
} catch (ClientException $e) {
$status = $e->getCode();
$this->logger->logException($e);
+ } catch (\Exception $e) {
+ $status = HTTP::STATUS_INTERNAL_SERVER_ERROR;
+ $this->logger->logException($e);
}
// if we received a unexpected response we try again later