Merge pull request #3168 from matrix-org/rav/fix_logformatter

Fix incorrect reference to StringIO
pull/3172/head
Richard van der Hoff 2018-05-02 10:03:36 +01:00 committed by GitHub
commit a8d8bf92e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 1 deletions

View File

@ -32,7 +32,7 @@ class LogFormatter(logging.Formatter):
super(LogFormatter, self).__init__(*args, **kwargs) super(LogFormatter, self).__init__(*args, **kwargs)
def formatException(self, ei): def formatException(self, ei):
sio = StringIO.StringIO() sio = StringIO()
(typ, val, tb) = ei (typ, val, tb) = ei
# log the stack above the exception capture point if possible, but # log the stack above the exception capture point if possible, but

View File

@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
# Copyright 2018 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import sys
from synapse.util.logformatter import LogFormatter
from tests import unittest
class TestException(Exception):
pass
class LogFormatterTestCase(unittest.TestCase):
def test_formatter(self):
formatter = LogFormatter()
try:
raise TestException("testytest")
except TestException:
ei = sys.exc_info()
output = formatter.formatException(ei)
# check the output looks vaguely sane
self.assertIn("testytest", output)
self.assertIn("Capture point", output)