summaryrefslogtreecommitdiff
path: root/service/pixelated/config/sessions.py
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@riseup.net>2016-10-19 16:56:43 -0200
committerBruno Wagner <bwagner@riseup.net>2016-10-19 16:56:43 -0200
commit425d6a54e13be2cdcd18f1b21a4ff70ae5d43ff0 (patch)
tree6705d319deaaf9aee234e82c7e0f6815926f17ba /service/pixelated/config/sessions.py
parentf47533fed69c0ede45285a236bb85efa2938f134 (diff)
Adapted logging in the UA to use twisted.logger
Diffstat (limited to 'service/pixelated/config/sessions.py')
-rw-r--r--service/pixelated/config/sessions.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index 2d186da5..ec5e1c0e 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -3,15 +3,14 @@ from __future__ import absolute_import
import os
import errno
import traceback
-
import requests
-import logging
-
import sys
+
from twisted.internet import defer, threads, reactor
+from twisted.logger import Logger
+
from leap.soledad.common.crypto import WrongMacError, UnknownMacMethodError
from leap.soledad.client import Soledad
-from pixelated.bitmask_libraries.keymanager import Keymanager
from leap.bitmask.mail.incoming.service import IncomingMail
from leap.bitmask.mail.mail import Account
import leap.common.certs as leap_certs
@@ -20,12 +19,13 @@ from leap.common.events import (
catalog as events
)
+from pixelated.bitmask_libraries.keymanager import Keymanager
from pixelated.adapter.mailstore import LeapMailStore
from pixelated.config import leap_config
from pixelated.bitmask_libraries.certs import LeapCertificate
from pixelated.bitmask_libraries.smtp import LeapSMTPConfig
-logger = logging.getLogger(__name__)
+logger = Logger()
class LeapSessionFactory(object):