summaryrefslogtreecommitdiff
path: root/service/pixelated/config/leap.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/leap.py
parentf47533fed69c0ede45285a236bb85efa2938f134 (diff)
Adapted logging in the UA to use twisted.logger
Diffstat (limited to 'service/pixelated/config/leap.py')
-rw-r--r--service/pixelated/config/leap.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py
index e9e4a796..b060170f 100644
--- a/service/pixelated/config/leap.py
+++ b/service/pixelated/config/leap.py
@@ -1,13 +1,16 @@
from __future__ import absolute_import
-import logging
from collections import namedtuple
+
from twisted.cred.error import UnauthorizedLogin
from twisted.internet import defer, threads
+from twisted.logger import Logger
+
from leap.common.events import (server as events_server)
from leap.soledad.common.errors import InvalidAuthTokenError
from leap.bitmask.bonafide._srp import SRPAuthError
from leap.bitmask.bonafide.session import Session
from leap.bitmask.bonafide.provider import Api
+
from pixelated.config import credentials
from pixelated.config import leap_config
from pixelated.config.authentication import Authentication
@@ -15,7 +18,7 @@ from pixelated.bitmask_libraries.certs import LeapCertificate
from pixelated.bitmask_libraries.provider import LeapProvider
from pixelated.config.sessions import LeapSessionFactory
-log = logging.getLogger(__name__)
+log = Logger()
Credentials = namedtuple('Credentials', 'username, password')