summaryrefslogtreecommitdiff
path: root/server/src/leap/soledad/server/auth.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-02-17 16:52:07 +0100
committerKali Kaneko <kali@leap.se>2017-02-17 21:03:03 +0100
commit193573cf8d44a3b6a7d8ae0e43988cffb38a428a (patch)
tree08c2b3a4c47c8e21fee25a06f0f8690d4c8ca258 /server/src/leap/soledad/server/auth.py
parentbab34cde11bdeb2810cc9f5d223957af26b2b6d3 (diff)
[bug] reuse wsgi threadpool
it seems evident that the functions were thought to pass a threadpool along, but it finally wasn't properly passed and so there was a new threadpool created to handle every resource. I have removed the creation from the factory because I don't think it makes sense to create a threadpool on the fly, it's prone to errors. - Resolves: #8774
Diffstat (limited to 'server/src/leap/soledad/server/auth.py')
-rw-r--r--server/src/leap/soledad/server/auth.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/src/leap/soledad/server/auth.py b/server/src/leap/soledad/server/auth.py
index e064341b..b5744fe9 100644
--- a/server/src/leap/soledad/server/auth.py
+++ b/server/src/leap/soledad/server/auth.py
@@ -48,8 +48,9 @@ log = Logger()
@implementer(IRealm)
class SoledadRealm(object):
- def __init__(self, conf=None, sync_pool=None):
- if not conf:
+ def __init__(self, sync_pool, conf=None):
+ assert sync_pool is not None
+ if conf is None:
conf = get_config()
blobs = conf['blobs']
self.anon_resource = SoledadAnonResource(
@@ -160,7 +161,7 @@ class TokenCredentialFactory(object):
raise error.LoginFailed('Invalid credentials')
-def portalFactory(sync_pool=None):
+def portalFactory(sync_pool):
realm = SoledadRealm(sync_pool=sync_pool)
checker = TokenChecker()
return Portal(realm, [checker])