summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-10-04 16:13:19 -0300
committerdrebs <drebs@riseup.net>2017-10-05 09:43:40 -0300
commit61a7ab212a1f7ed02b5d1020ab01ae825ba3696f (patch)
tree90e9559c9e46459038940a940e5423f07e561cfe
parentc6d41cf4fcac293a0e7ff09593d2a3c53c052174 (diff)
[bug] improve error message on blob download error
The previous error message had some problems: - the connection should not be a problem, as this is going over TCP. If the HTTP request was succesful, there's no reason to think its contents could have been corrupted by a connection problem. - I am not sure what's the best communication strategy here, but the real problem is either a bug or actual tampering, so i make this explicit. - A problem like this should be reported always, not only when the problem persists.
-rw-r--r--src/leap/soledad/client/_db/blobs.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/soledad/client/_db/blobs.py b/src/leap/soledad/client/_db/blobs.py
index 972c5389..d18b1616 100644
--- a/src/leap/soledad/client/_db/blobs.py
+++ b/src/leap/soledad/client/_db/blobs.py
@@ -555,10 +555,10 @@ class BlobManager(object):
message = "Corrupted blob received from server! ID: %s\n"
message += "Error: %r\n"
message += "Retries: %s - Attempts left: %s\n"
- message += "There is a chance of tampering. If this problem "
- message += "persists, please check your connection then report to "
- message += "your provider sysadmin and submit a bug report."
- message %= (blob_id, e, retries, self.max_retries - retries)
+ message += "This is either a bug or the contents of the "
+ message += "blob have been tampered with. Please, report "
+ message += "to your provider's sysadmin and submit a bug report."
+ message %= (blob_id, e, retries, (self.max_retries - retries))
logger.error(message)
yield self.local.increment_retries(blob_id)
if (retries + 1) >= self.max_retries: