summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/application.py14
-rw-r--r--service/pixelated/resources/root_resource.py2
2 files changed, 5 insertions, 11 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index 17dbacbf..2d7eb36d 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.py
@@ -72,16 +72,10 @@ def start_user_agent(root_resource, leap_home, leap_session):
if leap_session.fresh_account:
yield add_welcome_mail(leap_session.mail_store)
- servicesFactory = ServicesFactory()
- servicesFactory.add_session(leap_session.user_auth.uuid, services)
-
- root_resource.initialize(
- servicesFactory,
- services.keymanager,
- services.search_engine,
- services.mail_service,
- services.draft_service,
- services.feedback_service)
+ services_factory = ServicesFactory()
+ services_factory.add_session(leap_session.user_auth.uuid, services)
+
+ root_resource.initialize(services_factory, services.mail_service)
# soledad needs lots of threads
reactor.threadpool.adjustPoolsize(5, 15)
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index affa3713..b17e33fd 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -36,7 +36,7 @@ class RootResource(Resource):
return self
return Resource.getChild(self, path, request)
- def initialize(self, services_factory, keymanager, search_engine, mail_service, draft_service, feedback_service):
+ def initialize(self, services_factory, mail_service):
self.account_email = mail_service.account_email
self.putChild('assets', File(self._static_folder))
self.putChild('keys', KeysResource(services_factory))