Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Make fedmsg error handling py3 compatible.

Browse source 
Quite "innovative" code in here...
This commit is contained in:
Jan Kaluza 2018-09-26 18:10:45 +00:00 • committed by Ralph Bean
parent 74b797943f
commit 5112c3b9a4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/fedmsg/base/templates/logging.py.j2
View file

@ -64,7 +64,7 @@ class ContextInjector(logging.Filter):
record.callstack = self.format_callstack()
record.farewell = ""
key = hashlib.sha256(record.callstack).hexdigest()
key = hashlib.sha256(record.callstack.encode("utf-8")).hexdigest()
if not key in seen_errors:
seen_errors[key] = 0
@ -123,6 +123,9 @@ class ContextInjector(logging.Filter):
break
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)
stack = traceback.extract_stack()