From 7f60e3eb5136444c86401bb3a1c3ae27fce668a1 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Fri, 5 Jun 2015 16:48:07 -0300 Subject: Refactoring the config, logging_setup is now called logger --- service/pixelated/maintenance.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'service/pixelated/maintenance.py') diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py index c3e021b4..756ad435 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -15,27 +15,18 @@ # along with Pixelated. If not, see . from mailbox import Maildir -from pixelated.config.args import parse_maintenance_args -from pixelated.config.initialize_leap import initialize_leap -from pixelated.config.logging_setup import init_logging from twisted.internet import reactor, defer from twisted.internet.threads import deferToThread +from pixelated.config.initialize_leap import initialize_leap +from pixelated.config import logger, arguments from leap.mail.imap.fields import WithMsgFields -# 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_keymanager_fetch_key -import pixelated.support.ext_requests_urllib3 - def initialize(): - args = parse_maintenance_args() + args = arguments.parse_maintenance_args() - init_logging(debug=args.debug) + logger.init(debug=args.debug) leap_session = initialize_leap( args.leap_provider_cert, -- cgit v1.2.3