summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2016-09-27 22:11:39 -0300
committerdrebs <drebs@riseup.net>2016-10-03 12:01:46 -0300
commit5128c90b3c54546fd840d0efae1624ad69557a53 (patch)
tree3d729004b19045528b26e23cc2df61160b0cd1d0 /src
parent10330b390de4dfaf72853ecb4454bf4142415add (diff)
[bug] use correct twisted log api for warnings
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/core/_web.py2
-rw-r--r--src/leap/bitmask/mail/incoming/service.py16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py
index ce30a40a..1798e7f6 100644
--- a/src/leap/bitmask/core/_web.py
+++ b/src/leap/bitmask/core/_web.py
@@ -59,7 +59,7 @@ class HTTPDispatcherService(service.Service):
pkg_resources.resource_filename('leap.bitmask_js', 'public'))
log.debug('webdir: %s' % webdir)
else:
- log.warning('bitmask_js not found, serving bitmask.core ui')
+ log.warn('bitmask_js not found, serving bitmask.core ui')
webdir = os.path.abspath(
pkg_resources.resource_filename('leap.bitmask.core', 'web'))
root = File(webdir)
diff --git a/src/leap/bitmask/mail/incoming/service.py b/src/leap/bitmask/mail/incoming/service.py
index 86c3055c..b18ed744 100644
--- a/src/leap/bitmask/mail/incoming/service.py
+++ b/src/leap/bitmask/mail/incoming/service.py
@@ -629,9 +629,9 @@ class IncomingMail(Service):
Check for known decryption errors
"""
if failure.check(keymanager_errors.DecryptError):
- logger.warning('Failed to decrypt encrypted message (%s). '
- 'Storing message without modifications.'
- % str(failure.value))
+ logger.warn('Failed to decrypt encrypted message (%s). '
+ 'Storing message without modifications.'
+ % str(failure.value))
return (msg, None)
elif failure.check(keymanager_errors.KeyNotFound):
logger.error('Failed to find private key for decryption (%s). '
@@ -705,12 +705,12 @@ class IncomingMail(Service):
):
def fetch_error(failure):
if failure.check(keymanager_errors.KeyNotFound):
- logger.warning("Url from OpenPGP header %s failed"
- % (url,))
+ logger.warn("Url from OpenPGP header %s failed"
+ % (url,))
elif failure.check(keymanager_errors.KeyAttributesDiffer):
- logger.warning("Key from OpenPGP header url %s didn't "
- "match the from address %s"
- % (url, address))
+ logger.warn("Key from OpenPGP header url %s didn't "
+ "match the from address %s"
+ % (url, address))
else:
return failure