x
/
snap.openstack
Code Issues Proposed changes

Add home to uwsgi default args 

Change-Id: I34d65ab795f94f48f97de17b948c110ed0cb425e
This commit is contained in:
Corey Bryant 2017-04-20 00:36:36 +00:00
parent 034efe40ef
commit 30ae5eb8ba
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snap_openstack/base.py
View File

@ -35,6 +35,7 @@ VALID_EP_TYPES = (DEFAULT_EP_TYPE, UWSGI_EP_TYPE, NGINX_EP_TYPE)
DEFAULT_UWSGI_ARGS = ["--master",
"--die-on-term",
"-H", "{snap}/usr",
"--emperor"]
DEFAULT_NGINX_ARGS = ["-g",
@ -149,7 +150,8 @@ class OpenStackSnap(object):
elif cmd_type == UWSGI_EP_TYPE:
cmd = ["{snap}/bin/uwsgi".format(**utils.snap_env)]
cmd.extend(DEFAULT_UWSGI_ARGS)
defaults = [d.format(**utils.snap_env) for d in DEFAULT_UWSGI_ARGS]
cmd.extend(defaults)
uwsgi_dir = entry_point.get('uwsgi-dir')
if uwsgi_dir:

4
snap_openstack/tests/test_snap_openstack.py
View File

@ -113,8 +113,8 @@ class TestOpenStackSnapExecute(test_base.TestCase):
mock_os.execvp.assert_called_with(
'/snap/common/bin/uwsgi',
['/snap/common/bin/uwsgi', '--master',
'--die-on-term', '--emperor',
'/etc/uwsgi',
'--die-on-term', '-H', '/snap/common/usr',
'--emperor', '/etc/uwsgi',
'--logto', '/var/log/uwsgi/keystone.log']
)