Make fedmsg error handling py3 compatible.
Quite "innovative" code in here...
This commit is contained in:
parent
74b797943f
commit
5112c3b9a4
1 changed files with 4 additions and 1 deletions
|
@ -64,7 +64,7 @@ class ContextInjector(logging.Filter):
|
||||||
record.callstack = self.format_callstack()
|
record.callstack = self.format_callstack()
|
||||||
record.farewell = ""
|
record.farewell = ""
|
||||||
|
|
||||||
key = hashlib.sha256(record.callstack).hexdigest()
|
key = hashlib.sha256(record.callstack.encode("utf-8")).hexdigest()
|
||||||
if not key in seen_errors:
|
if not key in seen_errors:
|
||||||
seen_errors[key] = 0
|
seen_errors[key] = 0
|
||||||
|
|
||||||
|
@ -123,6 +123,9 @@ class ContextInjector(logging.Filter):
|
||||||
break
|
break
|
||||||
|
|
||||||
def _format_frame(frame):
|
def _format_frame(frame):
|
||||||
|
if type(frame) not in [tuple, list]:
|
||||||
|
# It must be FrameSummary, convert it to tuples.
|
||||||
|
frame = (frame.filename, frame.lineno, frame.name, "")
|
||||||
return ' File "%s", line %i in %s\n %s' % (frame)
|
return ' File "%s", line %i in %s\n %s' % (frame)
|
||||||
|
|
||||||
stack = traceback.extract_stack()
|
stack = traceback.extract_stack()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue