From 7b1af2ede753a63c9f584ccf37691917714e9655 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Mon, 8 Jun 2015 18:27:09 -0300 Subject: Fixed certificates initialization and removed which_api_bundle --- service/pixelated/application.py | 1 - 1 file changed, 1 deletion(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 55946a5e..67990661 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -15,7 +15,6 @@ # along with Pixelated. If not, see . import sys - from twisted.internet import reactor from twisted.internet.threads import deferToThread from twisted.internet import defer -- cgit v1.2.3 From bc130c82cd2167c76c2f46cef2971b168fcc694e Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 9 Jun 2015 16:28:13 -0300 Subject: clean unused imports after certs and app cleanup --- service/pixelated/application.py | 1 - 1 file changed, 1 deletion(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 67990661..2ae38c73 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import sys from twisted.internet import reactor from twisted.internet.threads import deferToThread from twisted.internet import defer -- cgit v1.2.3 From 786c26b37a89b6f7afc5524dafd35242688dc13b Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 9 Jun 2015 18:00:19 -0300 Subject: Extracted services setup in a separate class We removed app factory and moved root resource initialization to application.py --- service/pixelated/application.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 2ae38c73..6d83c6f7 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -23,16 +23,26 @@ from OpenSSL import SSL from OpenSSL import crypto from pixelated.config import arguments -from pixelated.resources import loading_page +from pixelated.config.services import Services from pixelated.config.leap import initialize_leap -from pixelated.config import logger, app_factory +from pixelated.config import logger +from pixelated.resources.loading_page import LoadingResource +from pixelated.resources.root_resource import RootResource @defer.inlineCallbacks def start_user_agent(loading_app, host, port, sslkey, sslcert, leap_home, leap_session): yield loading_app.stopListening() - resource = app_factory.init_app(leap_home, leap_session) + services = Services(leap_home, leap_session) + + resource = RootResource() + + resource.initialize( + services.keymanager, + services.search_engine, + services.mail_service, + services.draft_service) if sslkey and sslcert: reactor.listenSSL(port, Site(resource), _ssl_options(sslkey, sslcert), interface=host) @@ -62,7 +72,7 @@ def initialize(): args = arguments.parse_user_agent_args() logger.init(debug=args.debug) - loading_app = reactor.listenTCP(args.port, Site(loading_page.LoadingResource()), interface=args.host) + loading_app = reactor.listenTCP(args.port, Site(LoadingResource()), interface=args.host) deferred = deferToThread( lambda: initialize_leap( -- cgit v1.2.3