Adapted logging in the UA to use twisted.logger

4 files changed, 15 insertions, 13 deletions

diff --git a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
index 97a887f4..9cc522cf 100644
--- a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
+++ b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
@@ -13,11 +13,10 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import logging
 from twisted.internet import defer
+from twisted.logger import Logger
 
-
-logger = logging.getLogger(__name__)
+logger = Logger()
 
 
 class MailboxIndexerListener(object):
diff --git a/service/pixelated/adapter/mailstore/body_parser.py b/service/pixelated/adapter/mailstore/body_parser.py
index 7fb084af..5408bd9d 100644
--- a/service/pixelated/adapter/mailstore/body_parser.py
+++ b/service/pixelated/adapter/mailstore/body_parser.py
@@ -14,11 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
-from email.parser import Parser
 import re
-import logging
+from email.parser import Parser
+
+from twisted.logger import Logger
 
-logger = logging.getLogger(__name__)
+logger = Logger()
 
 
 def _parse_charset_header(content_type_and_charset_header, default_charset='us-ascii'):
diff --git a/service/pixelated/adapter/mailstore/maintenance/__init__.py b/service/pixelated/adapter/mailstore/maintenance/__init__.py
index 5dbe57ad..9a1007cc 100644
--- a/service/pixelated/adapter/mailstore/maintenance/__init__.py
+++ b/service/pixelated/adapter/mailstore/maintenance/__init__.py
@@ -17,7 +17,7 @@ from leap.bitmask.keymanager import documents as leap_doc
 from leap.bitmask.keymanager.keys import OpenPGPKey
 
 from twisted.internet import defer
-import logging
+from twisted.logger import Logger
 
 
 TYPE_OPENPGP_KEY = 'OpenPGPKey'
@@ -25,7 +25,7 @@ TYPE_OPENPGP_ACTIVE = 'OpenPGPKey-active'
 
 KEY_DOC_TYPES = {TYPE_OPENPGP_ACTIVE, TYPE_OPENPGP_KEY}
 
-logger = logging.getLogger(__name__)
+logger = Logger()
 
 
 def _is_key_doc(doc):
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 86f2642a..b6a8beb0 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -14,20 +14,22 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import re
-import logging
+import binascii
 from email.mime.text import MIMEText
 from email.header import Header
 from hashlib import sha256
-
-import binascii
 from email.MIMEMultipart import MIMEMultipart
 from email.mime.nonmultipart import MIMENonMultipart
-import leap.bitmask.mail.walk as walk
+
+from twisted.logger import Logger
+
+from leap.bitmask.mail import walk
+
 from pixelated.adapter.model.status import Status
 from pixelated.support import date
 
 
-logger = logging.getLogger(__name__)
+logger = Logger()
 
 
 class Mail(object):