summaryrefslogtreecommitdiff
path: root/service/pixelated/maintenance.py
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-06-05 16:48:07 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-06-05 16:48:07 -0300
commit7f60e3eb5136444c86401bb3a1c3ae27fce668a1 (patch)
tree5f256a4f2ca77cf7771b7dbc1f22fef1d28ff0f7 /service/pixelated/maintenance.py
parent65aa21198118105ed5772c546703d71ba9e9111e (diff)
Refactoring the config, logging_setup is now called logger
Diffstat (limited to 'service/pixelated/maintenance.py')
-rw-r--r--service/pixelated/maintenance.py17
1 files changed, 4 insertions, 13 deletions
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 <http://www.gnu.org/licenses/>.
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,