OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

logformatter: fix AttributeError 

make sure we have the relevant fields before we try to log them.
pull/2515/head
Richard van der Hoff 2017-10-11 17:26:17 +01:00
parent 3cc852d339
commit f30c4ed2bc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/util/logformatter.py
View File

@ -33,9 +33,17 @@ class LogFormatter(logging.Formatter):
def formatException(self, ei): def formatException(self, ei):
sio = StringIO.StringIO() sio = StringIO.StringIO()
sio.write("Capture point (most recent call last):\n") (typ, val, tb) = ei
traceback.print_stack(ei[2].tb_frame.f_back, None, sio)
traceback.print_exception(ei[0], ei[1], ei[2], None, sio) # log the stack above the exception capture point if possible, but
# check that we actually have an f_back attribute to work around
# https://twistedmatrix.com/trac/ticket/9305
if tb and hasattr(tb.tb_frame, 'f_back'):
sio.write("Capture point (most recent call last):\n")
traceback.print_stack(tb.tb_frame.f_back, None, sio)
traceback.print_exception(typ, val, tb, None, sio)
s = sio.getvalue() s = sio.getvalue()
sio.close() sio.close()
if s[-1:] == "\n": if s[-1:] == "\n":