summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2018-01-04 19:05:03 -0200
committerdrebs <drebs@leap.se>2018-01-04 19:05:03 -0200
commite5ce16c79fa744d1821127686b4d7db9d2db98b0 (patch)
tree5cedc7e5128da2fd469fd1dabbb23074d7a5764c
parent123f9ead4228c749f2d8d00fb755f46e568e5238 (diff)
[bug] fix error catching in blobs resource
-rw-r--r--src/leap/soledad/server/_blobs/resource.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/soledad/server/_blobs/resource.py b/src/leap/soledad/server/_blobs/resource.py
index 0772c29b..1c16f787 100644
--- a/src/leap/soledad/server/_blobs/resource.py
+++ b/src/leap/soledad/server/_blobs/resource.py
@@ -78,8 +78,8 @@ def _catchInvalidFlag(failure, request, user, blob_id):
request.finish()
-def _catchAllErrors(self, e, request):
- logger.error('Error processing request: %s' % e.getErrorMessage())
+def _catchAllErrors(failure, request):
+ logger.error('Error processing request: %r' % failure.value)
request.setResponseCode(500)
request.finish()
@@ -147,7 +147,7 @@ class BlobsResource(resource.Resource):
d.addCallback(_set_tag_header)
d.addCallback(_read_blob)
d.addErrback(_catchBlobNotFound, request, user, blob_id)
- d.addErrback(_catchAllErrors, request, finishRequest=True)
+ d.addErrback(_catchAllErrors, request)
return NOT_DONE_YET