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

Future proof ourselves against modern versions of python-psutil.

Browse source
This commit is contained in:
Ralph Bean 2015-09-28 18:04:59 +00:00
parent 05163cde24
commit 48af59b57c
7 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/anitya/fedmsg/templates/logging.py.j2
View file

@ -42,7 +42,13 @@ class ContextInjector(logging.Filter):
record.proc = current_process
record.pid = current_process.pid
record.proc_name = current_process.name
record.command_line = " ".join(current_process.cmdline)
record.command_line = current_process.cmdline
# These are callabls on more modern versions of psutil.
if callable(record.proc_name):
record.proc_name = record.proc_name()
if callable(record.command_line):
record.command_line = record.command_line()
record.command_line = " ".join(record.command_line)
record.callstack = self.format_callstack()
return True