diff options
| -rw-r--r-- | service/pixelated/application.py | 14 | ||||
| -rw-r--r-- | service/pixelated/resources/root_resource.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 3 |
3 files changed, 6 insertions, 13 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)) diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 186aeca2..8ff64e39 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -96,8 +96,7 @@ class AppTestClient(object): services.feedback_service = self.feedback_service self.service_factory.add_session('someuserid', services) - self.resource.initialize( - self.service_factory, self.keymanager, self.search_engine, self.mail_service, self.draft_service, self.feedback_service) + self.resource.initialize(self.service_factory, self.mail_service) def _render(self, request, as_json=True): def get_str(_str): |