Pass parameters when create eventlet.wsgi server

Otherwise, config option wsgi_log_format in neutron.conf
will not work

Closes-Bug: #1672615
Change-Id: I43a3b6d99f940b5276aabaccad15d1050023baa2
This commit is contained in:
Duan Jiong 2017-03-14 14:23:26 +08:00
parent 72916b54c9
commit 5fd6b4c768
4 changed files with 7 additions and 1 deletions

View File

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

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
@ -513,6 +514,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
)
@ -527,5 +529,6 @@ class TestUnixDomainWSGIServer(base.BaseTestCase):
'app',
protocol=utils.UnixDomainHttpProtocol,
log=mock.ANY,
log_format=cfg.CONF.wsgi_log_format,
max_size=num_threads
)

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
)

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)