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/__init__.py | 6 +++--- service/pixelated/resources/attachments_resource.py | 5 +++-- service/pixelated/resources/auth.py | 6 +++--- service/pixelated/resources/login_resource.py | 5 +++-- service/pixelated/resources/mails_resource.py | 21 +++++++++++---------- 5 files changed, 23 insertions(+), 20 deletions(-) (limited to 'service/pixelated/resources') diff --git a/service/pixelated/resources/__init__.py b/service/pixelated/resources/__init__.py index 0bd34619..11611f0b 100644 --- a/service/pixelated/resources/__init__.py +++ b/service/pixelated/resources/__init__.py @@ -15,16 +15,16 @@ # along with Pixelated. If not, see . import json -import logging from twisted.web.http import UNAUTHORIZED from twisted.web.resource import Resource +from twisted.logger import Logger -# from pixelated.resources.login_resource import LoginResource from pixelated.resources.session import IPixelatedSession from twisted.web.http import INTERNAL_SERVER_ERROR, SERVICE_UNAVAILABLE -log = logging.getLogger(__name__) + +log = Logger() class SetEncoder(json.JSONEncoder): diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py index 0149dfe2..1081b4b8 100644 --- a/service/pixelated/resources/attachments_resource.py +++ b/service/pixelated/resources/attachments_resource.py @@ -16,7 +16,6 @@ import cgi import io import re -import logging from twisted.internet import defer from twisted.protocols.basic import FileSender @@ -24,10 +23,12 @@ from twisted.python.log import msg from twisted.web import server from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET +from twisted.logger import Logger from pixelated.resources import respond_json_deferred, BaseResource -logger = logging.getLogger(__name__) + +logger = Logger() class AttachmentResource(Resource): diff --git a/service/pixelated/resources/auth.py b/service/pixelated/resources/auth.py index 6d675eb3..3afbbc36 100644 --- a/service/pixelated/resources/auth.py +++ b/service/pixelated/resources/auth.py @@ -14,27 +14,27 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import logging import re +from zope.interface import implements, implementer, Attribute from twisted.cred.checkers import ANONYMOUS from twisted.cred.credentials import ICredentials from twisted.cred.error import UnauthorizedLogin from twisted.internet import defer from twisted.web._auth.wrapper import UnauthorizedResource from twisted.web.error import UnsupportedMethod -from zope.interface import implements, implementer, Attribute from twisted.cred import portal, checkers, credentials from twisted.web import util from twisted.cred import error from twisted.web.resource import IResource, ErrorPage +from twisted.logger import Logger from leap.bitmask.bonafide._srp import SRPAuthError from pixelated.config.leap import create_leap_session, authenticate from pixelated.resources import IPixelatedSession -log = logging.getLogger(__name__) +log = Logger() @implementer(checkers.ICredentialsChecker) diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index e19f9038..4c4d58c0 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import logging import os from xml.sax import SAXParseException @@ -27,11 +26,13 @@ from twisted.web.resource import IResource, NoResource from twisted.web.server import NOT_DONE_YET from twisted.web.static import File from twisted.web.template import Element, XMLFile, renderElement, renderer +from twisted.logger import Logger + from pixelated.resources import handle_error_deferred from pixelated.adapter.welcome_mail import add_welcome_mail from pixelated.resources import BaseResource, UnAuthorizedResource, IPixelatedSession -log = logging.getLogger(__name__) +log = Logger() def _get_startup_folder(): 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