summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-04 16:47:26 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-04 16:47:26 -0300
commit57d350296e1e01a3dfd26399445fe280abf805ab (patch)
treed32b920742d5cd0cba9bd501fe2df403f41bca04 /server
parent5739d2c3a653639887f7af82795bcb5e8b4b9748 (diff)
Revert "Remove creation of shared database from soledad server code. Closes #4566."
This reverts commit eb07702bc4c1d51e0307b655b14bc1a3835488b2.
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code1
-rw-r--r--server/src/leap/soledad/server/__init__.py2
2 files changed, 2 insertions, 1 deletions
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)