diff options
| author | drebs <drebs@leap.se> | 2015-04-09 12:20:19 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-04-09 12:20:19 -0300 |
| commit | 5a9eac4ba0d4ddc419fdaaee4d08dbc7d8115294 (patch) | |
| tree | efe96285a8fa692aca7a5729fcd420aaa333551e /server | |
| parent | 578d986b8eb502cde027c0cd1e05742a59def496 (diff) | |
[fix] remove unneded params to CouchServerState
This commit removes some leftover code from a time when Soledad Server used to
check for permissions on certain databases when starting (i.e. shared and
tokens databases). This was later removed as correct permissions enforcement
was relayed to tapicero.
Closes: #6833.
Diffstat (limited to 'server')
| -rw-r--r-- | server/changes/bug_6833_remove-unneeded-params-from-couch-server-state | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state new file mode 100644 index 00000000..2c927717 --- /dev/null +++ b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state @@ -0,0 +1,2 @@ + o Remove unneeded parameters from CouchServerState initialization. Closes + #6833. diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index cd006f51..adb5b561 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -296,10 +296,7 @@ def load_configuration(file_path): def application(environ, start_response): conf = load_configuration('/etc/leap/soledad-server.conf') - state = CouchServerState( - conf['couch_url'], - SoledadApp.SHARED_DB_NAME, - SoledadTokenAuthMiddleware.TOKENS_DB) + state = CouchServerState(conf['couch_url']) # WSGI application that may be used by `twistd -web` application = GzipMiddleware( SoledadTokenAuthMiddleware(SoledadApp(state))) |