openstack
/
neutron
Code Issues Proposed changes

Merge "Pass parameters when create eventlet.wsgi server" into stable/ocata

This commit is contained in:
Zuul 2018-02-15 05:38:11 +00:00 committed by Gerrit Code Review
parent 7eeec974a5 ee259950e2
commit b7881b06bc
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/linux/utils.py
View File

@ -442,4 +442,5 @@ class UnixDomainWSGIServer(wsgi.Server):
application,
max_size=self.num_threads,
protocol=UnixDomainHttpProtocol,
log=logger)
log=logger,
log_format=cfg.CONF.wsgi_log_format)

3
neutron/tests/unit/agent/linux/test_utils.py
View File

@ -19,6 +19,7 @@ import mock
import six
import testtools
from oslo_config import cfg
import oslo_i18n
from neutron.agent.linux import utils
@ -524,6 +525,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
)
@ -538,5 +540,6 @@ class TestUnixDomainWSGIServer(base.BaseTestCase):
'app',
protocol=utils.UnixDomainHttpProtocol,
log=mock.ANY,
log_format=cfg.CONF.wsgi_log_format,
max_size=num_threads
)

1
neutron/tests/unit/test_wsgi.py
View File

@ -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
)

1
neutron/wsgi.py
View File

@ -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)