From 425d6a54e13be2cdcd18f1b21a4ff70ae5d43ff0 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 19 Oct 2016 16:56:43 -0200 Subject: Adapted logging in the UA to use twisted.logger --- service/pixelated/resources/mails_resource.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'service/pixelated/resources/mails_resource.py') diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py index 0077ce57..78826126 100644 --- a/service/pixelated/resources/mails_resource.py +++ b/service/pixelated/resources/mails_resource.py @@ -1,20 +1,21 @@ import time import json -import logging -from pixelated.adapter.services.mail_sender import SMTPDownException -from pixelated.adapter.model.mail import InputMail + +from twisted.internet import defer +from twisted.logger import Logger from twisted.web.server import NOT_DONE_YET -from pixelated.resources import respond_json_deferred, BaseResource from twisted.web.resource import Resource from twisted.web import server -from twisted.internet import defer -from twisted.python.log import err + from leap.common import events +from pixelated.adapter.model.mail import InputMail +from pixelated.resources import respond_json_deferred, BaseResource +from pixelated.adapter.services.mail_sender import SMTPDownException from pixelated.support.functional import to_unicode -log = logging.getLogger(__name__) +log = Logger() class MailsUnreadResource(Resource): @@ -66,7 +67,7 @@ class MailsDeleteResource(Resource): def render_POST(self, request): def response_failed(failure): - err(failure, 'something failed') + logger.error(failure, 'something failed') request.finish() idents = json.loads(request.content.read())['idents'] @@ -174,7 +175,7 @@ class MailsResource(BaseResource): if isinstance(error.value, SMTPDownException): respond_json_deferred({'message': str(error.value)}, request, status_code=503) else: - err(error, 'error occurred while sending') + logger.error(error, 'error occurred while sending') respond_json_deferred({'message': 'an error occurred while sending'}, request, status_code=422) deferred = self._handle_post(request) @@ -184,7 +185,7 @@ class MailsResource(BaseResource): def render_PUT(self, request): def onError(error): - err(error, 'error saving draft') + logger.error(error, 'error saving draft') respond_json_deferred("", request, status_code=422) deferred = self._handle_put(request) -- cgit v1.2.3