diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-12-06 14:46:59 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-12-06 14:46:59 -0300 |
| commit | a87d67bac35a36cca491853268d7f518d028c9c2 (patch) | |
| tree | 135fa37f2f641231d24f426782f6038fdc9a981f | |
| parent | ad5c19275fc295246aec6c6cd8f4b3154c280560 (diff) | |
| parent | 57d350296e1e01a3dfd26399445fe280abf805ab (diff) | |
Merge remote-tracking branch 'chiiph/bug/revert_database_creation' into develop
4 files changed, 3 insertions, 4 deletions
diff --git a/client/changes/feature_4626_stop-creating-per-user-databases b/client/changes/feature_4626_stop-creating-per-user-databases deleted file mode 100644 index b967abd3..00000000 --- a/client/changes/feature_4626_stop-creating-per-user-databases +++ /dev/null @@ -1,2 +0,0 @@ - o Stop creating per-user databases, as now there's another service that does - this automatically (tapicero). Closes #4626. diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index c168bfdc..62f93b3d 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -1038,7 +1038,7 @@ class Soledad(object): if self._db: local_gen = self._db.sync( urlparse.urljoin(self.server_url, 'user-%s' % self._uuid), - creds=self._creds, autocreate=False) + creds=self._creds, autocreate=True) signal(SOLEDAD_DONE_DATA_SYNC, self._uuid) return local_gen diff --git a/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code b/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code deleted file mode 100644 index 9e9a1b98..00000000 --- a/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code +++ /dev/null @@ -1 +0,0 @@ - o Remove creation of shared db from soledad server code. Closes #4566. diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index da806ad9..c80b4c68 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -149,6 +149,8 @@ class SoledadApp(http_app.HTTPApp): @return: HTTP application results. @rtype: list """ + # ensure the shared database exists + self.state.ensure_database(self.SHARED_DB_NAME) return http_app.HTTPApp.__call__(self, environ, start_response) |