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

This could be either kind of error.

Browse source
This commit is contained in:
Ralph Bean 2014-07-07 15:12:56 +00:00
parent 78b92983ca
commit e6e6a957d1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/fedmsg/base/templates/base.py.j2
View file

@ -55,7 +55,7 @@ try:
config['moksha.monitoring.socket'] = \
'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
except OSError:
except (OSError, ImportError):
# We run into issues when trying to import psutil from mod_wsgi on rhel7
# but this feature is of no concern in that context, so just fail quietly.
# https://github.com/jmflinuxtx/kerneltest-harness/pull/17#issuecomment-48007837

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

@ -10,7 +10,7 @@ import traceback
psutil = None
try:
import psutil
except OSError:
except (OSError, ImportError):
# We run into issues when trying to import psutil from inside mod_wsgi on
# rhel7. If we hit that here, then just fail quietly.
# https://github.com/jmflinuxtx/kerneltest-harness/pull/17#issuecomment-48007837