summaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-01-06 15:19:01 -0400
committerKali Kaneko <kali@leap.se>2014-01-06 15:19:01 -0400
commitf98f66549d6762bbfc072ef6afe0057798a4da27 (patch)
tree268983c0ac554860c39f25a7521fe45bc816aab7 /common/src
parenta2fc60a03f701abd2309dee23c383f1189ce3cf4 (diff)
parent89d3e4a1321ff9701ac67933f8e649cfecd1d95e (diff)
Merge remote-tracking branch 'drebs-github/bug/4435_add-proper-error-reporting-to-shared-db-lock' into develop
Diffstat (limited to 'common/src')
-rw-r--r--common/src/leap/soledad/common/errors.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/common/src/leap/soledad/common/errors.py b/common/src/leap/soledad/common/errors.py
index 7c2d7296..62de19f8 100644
--- a/common/src/leap/soledad/common/errors.py
+++ b/common/src/leap/soledad/common/errors.py
@@ -57,14 +57,26 @@ class AlreadyLockedError(errors.U1DBError):
wire_description = "lock is locked"
status = 403
+
+class LockTimedOutError(errors.U1DBError):
+ """
+ Exception raised when timing out while trying to lock the shared database.
+ """
+
+ wire_description = "lock timed out"
+ status = 408
+
+
# update u1db "wire description to status" and "wire description to exception"
# maps.
-for e in [InvalidTokenError, NotLockedError, AlreadyLockedError]:
+for e in [InvalidTokenError, NotLockedError, AlreadyLockedError,
+ LockTimedOutError]:
http_errors.wire_description_to_status.update({
e.wire_description: e.status})
errors.wire_description_to_exc.update({
e.wire_description: e})
+
# u1db error statuses also have to be updated
http_errors.ERROR_STATUSES = set(
http_errors.wire_description_to_status.values())