diff options
author | Bruno Wagner <bwagner@riseup.net> | 2016-10-19 16:56:43 -0200 |
---|---|---|
committer | Bruno Wagner <bwagner@riseup.net> | 2016-10-19 16:56:43 -0200 |
commit | 425d6a54e13be2cdcd18f1b21a4ff70ae5d43ff0 (patch) | |
tree | 6705d319deaaf9aee234e82c7e0f6815926f17ba /service/pixelated/config | |
parent | f47533fed69c0ede45285a236bb85efa2938f134 (diff) |
Adapted logging in the UA to use twisted.logger
Diffstat (limited to 'service/pixelated/config')
-rw-r--r-- | service/pixelated/config/leap.py | 7 | ||||
-rw-r--r-- | service/pixelated/config/services.py | 8 | ||||
-rw-r--r-- | service/pixelated/config/sessions.py | 10 |
3 files changed, 15 insertions, 10 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') diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 116e903a..1f59c255 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -1,5 +1,7 @@ import os -import logging + +from twisted.internet import defer, reactor +from twisted.logger import Logger from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore @@ -9,11 +11,11 @@ from pixelated.adapter.services.mail_sender import MailSender from pixelated.adapter.search import SearchEngine from pixelated.adapter.services.draft_service import DraftService from pixelated.adapter.listeners.mailbox_indexer_listener import listen_all_mailboxes -from twisted.internet import defer, reactor from pixelated.adapter.search.index_storage_key import SearchIndexStorageKey from pixelated.adapter.services.feedback_service import FeedbackService from pixelated.config import leap_config -logger = logging.getLogger(__name__) + +logger = Logger() class Services(object): 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): |