From 7385a8be51ba68073794e282ebc8b602b8a61072 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 9 Jun 2017 19:38:48 +0000 Subject: [PATCH] Changed name and signature for a log helper. - Legacy-Id: 13571 --- ietf/middleware.py | 4 ++-- ietf/utils/log.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ietf/middleware.py b/ietf/middleware.py index 31b23b960..b8098d2df 100644 --- a/ietf/middleware.py +++ b/ietf/middleware.py @@ -4,7 +4,7 @@ from django.db import connection from django.db.utils import OperationalError from django.shortcuts import render from django.http import HttpResponsePermanentRedirect -from ietf.utils.log import log, exception_components +from ietf.utils.log import log, exc_parts from ietf.utils.mail import log_smtp_exception import re import smtplib @@ -39,7 +39,7 @@ class Utf8ExceptionMiddleware(object): return self.get_response(request) def process_exception(self, request, exception): if isinstance(exception, OperationalError): - extype, value, tb = exception_components(exception) + extype, value, tb = exc_parts() if value[0] == 1366: log("Database 4-byte utf8 exception: %s: %s" % (extype, value)) return render(request, 'utf8_4byte_failed.html', diff --git a/ietf/utils/log.py b/ietf/utils/log.py index 766a74b8c..6d35a2832 100644 --- a/ietf/utils/log.py +++ b/ietf/utils/log.py @@ -55,10 +55,11 @@ logger = logging.getLogger('django') -def exception_components(e): - extype = sys.exc_info()[0] - value = sys.exc_info()[1] - tb = traceback.format_tb(sys.exc_info()[2]) +def exc_parts(): + info = sys.exc_info() + extype = info[0] + value = info[1] + tb = traceback.format_tb(info[2]) return (extype, value, tb) def build_traceback(stack):