summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-10-13 21:34:40 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-11-03 12:38:59 -0300
commitf0b96af943dcb6c8cde4f6d4280186d78c78096c (patch)
treeefe7b8876b786d99684f003ee475994e9051a4c2 /server
parentb0557f9c1d5e6f153f926ba3cb5876453ef23a10 (diff)
[refactor] split out backend from couch database
First step of splitting classes across files on common. backend.py holds SoledadBackend (generic backend logic) couch/ is now a directory with old code inside __init__.py and CouchServerState on state.py Also removed mock IndexedSoledadBackend, since Soledad does not support indexing due to encryption on server side. Also fixed DesignDocUnknownError to show up what is the message of the original exception. It was being lost.
Diffstat (limited to 'server')
-rwxr-xr-xserver/pkg/create-user-db6
-rw-r--r--server/src/leap/soledad/server/__init__.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db
index a8ba3833..54856643 100755
--- a/server/pkg/create-user-db
+++ b/server/pkg/create-user-db
@@ -19,8 +19,8 @@ import os
import sys
import netrc
import argparse
-from leap.soledad.common.couch import SoledadBackend
-from leap.soledad.common.couch import is_db_name_valid
+from leap.soledad.common.couch import CouchDatabase
+from leap.soledad.common.couch.state import is_db_name_valid
from leap.soledad.common.couch import list_users_dbs
from leap.soledad.server import load_configuration
@@ -69,7 +69,7 @@ def ensure_database(dbname):
sys.exit(1)
url = url_for_db(dbname)
db_security = CONF['database-security']
- db = SoledadBackend.open_database(url=url, create=True,
+ db = CouchDatabase.open_database(url=url, create=True,
replica_uid=None, ensure_ddocs=True,
database_security=db_security)
print ('success! Ensured that database %s exists, with replica_uid: %s' %
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index 618ccb2b..00e1e9fb 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -104,7 +104,7 @@ from leap.soledad.server.sync import (
)
from leap.soledad.common import SHARED_DB_NAME
-from leap.soledad.common.couch import CouchServerState
+from leap.soledad.common.couch.state import CouchServerState
# ----------------------------------------------------------------------------
# Soledad WSGI application