Future proof ourselves against modern versions of python-psutil.
This commit is contained in:
parent
05163cde24
commit
48af59b57c
7 changed files with 45 additions and 7 deletions
|
@ -92,8 +92,13 @@ try:
|
|||
pid = os.getpid()
|
||||
proc = [p for p in psutil.process_iter() if p.pid == pid][0]
|
||||
|
||||
# proc.name is a method on modern versions of psutil.
|
||||
name = proc.name
|
||||
if callable(name):
|
||||
name = name()
|
||||
|
||||
config['moksha.monitoring.socket'] = \
|
||||
'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
|
||||
'ipc:///var/run/fedmsg/monitoring-%s.socket' % name
|
||||
config['moksha.monitoring.socket.mode'] = '770'
|
||||
except (OSError, ImportError):
|
||||
# We run into issues when trying to import psutil from mod_wsgi on rhel7
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue