From fd1820c2951f27341a0010cfc4c6009abdfe8261 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 2 Jun 2015 19:28:01 -0300 Subject: Started isolating leap initialization, so we can call it in one place instead of across all of initialization --- service/pixelated/config/__init__.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'service/pixelated/config/__init__.py') diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py index 2706cd6f..e9953ded 100644 --- a/service/pixelated/config/__init__.py +++ b/service/pixelated/config/__init__.py @@ -26,28 +26,22 @@ from pixelated.config.events_server import init_events_server from pixelated.config.loading_page import loading from pixelated.config.register import register from pixelated.config.logging_setup import init_logging -from pixelated.config.leap_cert import init_leap_cert from pixelated.config.soledad import init_soledad_and_user_key from twisted.internet import reactor from twisted.internet.threads import deferToThread - -# monkey patching some specifics -import pixelated.support.ext_protobuf -import pixelated.support.ext_sqlcipher -import pixelated.support.ext_esmtp_sender_factory -import pixelated.support.ext_fetch -import pixelated.support.ext_sync -import pixelated.support.ext_keymanager_fetch_key -import pixelated.support.ext_requests_urllib3 from pixelated.support.error_handler import error_handler +from pixelated.config.initialize_leap import initialize_leap + def initialize(): args = parse_args() - app = App() - init_logging(debug=args.debug) - init_leap_cert(args) + + initialize_leap(args.leap_provider_cert, + args.leap_provider_cert_fingerprint) + + app = App() if args.register: register(*args.register) -- cgit v1.2.3