summaryrefslogtreecommitdiff
path: root/common/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-11-19 22:59:24 -0400
committerKali Kaneko <kali@leap.se>2015-11-19 22:59:24 -0400
commitf8982e74768fd7039b543a97060701dec444a9f5 (patch)
treec054026ce2bdc426986e39bd7b41e0e70a967b42 /common/src/leap
parent4fae5af899396db68db8130e7de2b25ec52addb1 (diff)
parentbb228d13aa14cabe7448f9c7e5b55744de36843a (diff)
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'common/src/leap')
-rw-r--r--common/src/leap/soledad/common/couch/errors.py4
-rw-r--r--common/src/leap/soledad/common/errors.py8
2 files changed, 10 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/couch/errors.py b/common/src/leap/soledad/common/couch/errors.py
index e894d58f..9b287c76 100644
--- a/common/src/leap/soledad/common/couch/errors.py
+++ b/common/src/leap/soledad/common/couch/errors.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from leap.soledad.common.errors import SoledadError
+from leap.soledad.common.errors import SoledadError, BackendNotReadyError
from leap.soledad.common.errors import register_exception
"""
@@ -23,7 +23,7 @@ Specific errors that can be raised by CouchDatabase.
@register_exception
-class MissingDesignDocError(SoledadError):
+class MissingDesignDocError(BackendNotReadyError):
"""
Raised when trying to access a missing couch design document.
diff --git a/common/src/leap/soledad/common/errors.py b/common/src/leap/soledad/common/errors.py
index 2f6fd1d8..7a8a8929 100644
--- a/common/src/leap/soledad/common/errors.py
+++ b/common/src/leap/soledad/common/errors.py
@@ -143,3 +143,11 @@ class InvalidURLError(Exception):
"""
Exception raised when Soledad encounters a malformed URL.
"""
+
+
+@register_exception
+class BackendNotReadyError(SoledadError):
+ """
+ Generic exception raised when the backend is not ready to dispatch a client
+ request.
+ """