From ab4d973e47e44b1dfafe8ea2d70476373d953767 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 20 Dec 2016 12:33:19 -0500 Subject: [PATCH] Add support for uwsgi log file Change-Id: I6fcd9773837e75987b6df2cb5d5a0c093085a774 --- snap_openstack/base.py | 6 ++++++ snap_openstack/tests/test_snap_openstack.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/snap_openstack/base.py b/snap_openstack/base.py index cbd24c0..773f457 100644 --- a/snap_openstack/base.py +++ b/snap_openstack/base.py @@ -154,10 +154,16 @@ class OpenStackSnap(object): elif cmd_type == UWSGI_EP_TYPE: cmd = [UWSGI_EP_TYPE] cmd.extend(DEFAULT_UWSGI_ARGS) + uwsgi_dir = entry_point.get('uwsgi-dir') if uwsgi_dir: uwsgi_dir = uwsgi_dir.format(**self.snap_env) cmd.append(uwsgi_dir) + log_file = entry_point.get('log-file') + if log_file: + log_file = log_file.format(**self.snap_env) + cmd.extend(['--logto', log_file]) + LOG.debug('Executing command {}'.format(' '.join(cmd))) os.execvp(cmd[0], cmd) diff --git a/snap_openstack/tests/test_snap_openstack.py b/snap_openstack/tests/test_snap_openstack.py index a544708..b30d4cd 100644 --- a/snap_openstack/tests/test_snap_openstack.py +++ b/snap_openstack/tests/test_snap_openstack.py @@ -114,7 +114,8 @@ class TestOpenStackSnapExecute(test_base.TestCase): 'uwsgi', ['uwsgi', '--master', '--die-on-term', '--emperor', - '/var/snap/test/common/etc/uwsgi'] + '/var/snap/test/common/etc/uwsgi', + '--logto', '/var/snap/test/common/logs/keystone.log'] ) @patch.object(base, 'snap_env')