summaryrefslogtreecommitdiff
path: root/server/src/leap/soledad
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-02-10 22:46:15 +0100
committerKali Kaneko <kali@leap.se>2017-02-10 22:46:21 +0100
commite095cd3f00a06bf0e3705b28d01b49b61388ef85 (patch)
treef2d6ae89366ef4fcb11b405efb66c4c1ae467ae9 /server/src/leap/soledad
parent3b41a4de9c0d0f32815fbd11df3b379bc8688069 (diff)
[bug] revert loading from the wsgi entrypoint
Diffstat (limited to 'server/src/leap/soledad')
-rw-r--r--server/src/leap/soledad/server/_wsgi.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/server/src/leap/soledad/server/_wsgi.py b/server/src/leap/soledad/server/_wsgi.py
index f0961eaf..37a03ced 100644
--- a/server/src/leap/soledad/server/_wsgi.py
+++ b/server/src/leap/soledad/server/_wsgi.py
@@ -27,7 +27,6 @@ from leap.soledad.common.backend import SoledadBackend
from leap.soledad.common.couch.state import CouchServerState
from leap.soledad.common.log import getLogger
-from ._config import get_config
__all__ = ['init_couch_state', 'get_sync_resource']
@@ -67,12 +66,3 @@ def get_sync_resource(pool=None):
reactor.callWhenRunning(pool.start)
reactor.addSystemEventTrigger('after', 'shutdown', pool.stop)
return WSGIResource(reactor, pool, wsgi_application)
-
-
-# load configuration from file
-conf = get_config()
-
-# see the comments in application.py recarding why couch state has to be
-# initialized when the reactor is running
-
-reactor.callWhenRunning(init_couch_state, conf)