diff options
| author | drebs <drebs@riseup.net> | 2016-10-13 12:08:46 -0300 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-10-17 19:38:21 -0400 |
| commit | c8eba064959310e44bdc2a4f0df49a534e761d04 (patch) | |
| tree | 8d5e30031d291c1db78a746b1941e25514c1e01d /src/leap/bitmask/mail | |
| parent | c1fdf7dfa3ba6f7eeca2a1f980ab4a68da735654 (diff) | |
[bug] use twisted.logger and fix logging namespace
Diffstat (limited to 'src/leap/bitmask/mail')
| -rw-r--r-- | src/leap/bitmask/mail/imap/account.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/mail/incoming/service.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/mail/imap/account.py b/src/leap/bitmask/mail/imap/account.py index 8ee0cbf..63d214e 100644 --- a/src/leap/bitmask/mail/imap/account.py +++ b/src/leap/bitmask/mail/imap/account.py @@ -24,7 +24,6 @@ from functools import partial from twisted.internet import defer from twisted.logger import Logger from twisted.mail import imap4 -from twisted.logger import Logger from zope.interface import implements from leap.common.check import leap_assert, leap_assert_type @@ -40,7 +39,7 @@ PROFILE_CMD = os.environ.get('LEAP_PROFILE_IMAPCMD', False) if PROFILE_CMD: def _debugProfiling(result, cmdname, start): took = (time.time() - start) * 1000 - log.msg("CMD " + cmdname + " TOOK: " + str(took) + " msec") + logger.debug("CMD " + cmdname + " TOOK: " + str(took) + " msec") return result diff --git a/src/leap/bitmask/mail/incoming/service.py b/src/leap/bitmask/mail/incoming/service.py index ddbdd2a..38a2290 100644 --- a/src/leap/bitmask/mail/incoming/service.py +++ b/src/leap/bitmask/mail/incoming/service.py @@ -49,7 +49,7 @@ from leap.soledad.common.crypto import ENC_SCHEME_KEY, ENC_JSON_KEY from leap.soledad.common.errors import InvalidAuthTokenError -logger = Logger(__name__) +logger = Logger() MULTIPART_ENCRYPTED = "multipart/encrypted" MULTIPART_SIGNED = "multipart/signed" |