From e5ce16c79fa744d1821127686b4d7db9d2db98b0 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 4 Jan 2018 19:05:03 -0200
Subject: [PATCH] [bug] fix error catching in blobs resource
---
src/leap/soledad/server/_blobs/resource.py | 6 +++---
1 file 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
--
GitLab