From e095cd3f00a06bf0e3705b28d01b49b61388ef85 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 10 Feb 2017 22:46:15 +0100 Subject: [bug] revert loading from the wsgi entrypoint --- server/src/leap/soledad/server/_wsgi.py | 10 ---------- 1 file changed, 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) -- cgit v1.2.3