Merge branch 'develop' into rav/more_logcontext_leaks

This commit is contained in:
Richard van der Hoff 2018-05-02 16:16:01 +01:00
commit 415c6b672e
6 changed files with 71 additions and 6 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.28.0"
__version__ = "0.28.1"

View file

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