diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 06cbbee11b9..eeacd8aadba 100644 --- a/neutron/agent/linux/utils.py +++ b/neutron/agent/linux/utils.py @@ -421,4 +421,5 @@ class UnixDomainWSGIServer(wsgi.Server): application, max_size=self.num_threads, protocol=UnixDomainHttpProtocol, - log=logger) + log=logger, + log_format=cfg.CONF.wsgi_log_format) diff --git a/neutron/tests/unit/agent/linux/test_utils.py b/neutron/tests/unit/agent/linux/test_utils.py index 8c38d5758ef..6bb2696114a 100644 --- a/neutron/tests/unit/agent/linux/test_utils.py +++ b/neutron/tests/unit/agent/linux/test_utils.py @@ -19,6 +19,7 @@ import mock import six import testtools +from oslo_config import cfg import oslo_i18n from neutron.agent.linux import utils @@ -521,6 +522,7 @@ class TestUnixDomainWSGIServer(base.BaseTestCase): 'app', protocol=utils.UnixDomainHttpProtocol, log=mock.ANY, + log_format=cfg.CONF.wsgi_log_format, max_size=self.server.num_threads ) @@ -535,5 +537,6 @@ class TestUnixDomainWSGIServer(base.BaseTestCase): 'app', protocol=utils.UnixDomainHttpProtocol, log=mock.ANY, + log_format=cfg.CONF.wsgi_log_format, max_size=num_threads ) diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py index a8cfedd5b8e..c7e60c274ea 100644 --- a/neutron/tests/unit/test_wsgi.py +++ b/neutron/tests/unit/test_wsgi.py @@ -205,6 +205,7 @@ class TestWSGIServer(base.BaseTestCase): max_size=server.num_threads, log=mock.ANY, keepalive=CONF.wsgi_keep_alive, + log_format=CONF.wsgi_log_format, socket_timeout=server.client_socket_timeout ) diff --git a/neutron/wsgi.py b/neutron/wsgi.py index 8c30064fe00..a7b13c7c0b7 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -221,6 +221,7 @@ class Server(object): max_size=self.num_threads, log=LOG, keepalive=CONF.wsgi_keep_alive, + log_format=CONF.wsgi_log_format, socket_timeout=self.client_socket_timeout)