diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-17 13:58:30 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-17 13:58:30 -0300 |
| commit | 83b0a1ca27d723022ea6ff58e52fde6fcbdb5aa4 (patch) | |
| tree | 953931a9043a836da6b81a3741f5475e5f659aab /server | |
| parent | b8179bee47902aa744ff982663288362aa767332 (diff) | |
| parent | 7741a372157972dfe6a46a16ccdf860df1faa943 (diff) | |
Merge remote-tracking branch 'refs/remotes/drebs/feature/4994_improve-error-messages-on-client' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs | 3 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs b/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs new file mode 100644 index 00000000..f37a8c18 --- /dev/null +++ b/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs @@ -0,0 +1,3 @@ + o Catch couchdb.http.ResourceNotFound exceptions when accessing design + documents on couch backend, and raise appropriate missing design documents + exceptions. Fixes #4994. diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 4380966c..26c33222 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -204,7 +204,7 @@ class LockResource(object): self._lock_doc_id = '%s%s' % (SHARED_DB_LOCK_DOC_ID_PREFIX, uuid) self._lock = FilesystemLock( os.path.join( - tempfile.gettmpdir(), + tempfile.gettempdir(), hashlib.sha512(self._lock_doc_id).hexdigest())) self._state = state self._responder = responder |