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:
parent
72916b54c9
commit
5fd6b4c768
|
@ -432,4 +432,5 @@ class UnixDomainWSGIServer(wsgi.Server):
|
||||||
application,
|
application,
|
||||||
max_size=self.num_threads,
|
max_size=self.num_threads,
|
||||||
protocol=UnixDomainHttpProtocol,
|
protocol=UnixDomainHttpProtocol,
|
||||||
log=logger)
|
log=logger,
|
||||||
|
log_format=cfg.CONF.wsgi_log_format)
|
||||||
|
|
|
@ -19,6 +19,7 @@ import mock
|
||||||
import six
|
import six
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
import oslo_i18n
|
import oslo_i18n
|
||||||
|
|
||||||
from neutron.agent.linux import utils
|
from neutron.agent.linux import utils
|
||||||
|
@ -513,6 +514,7 @@ class TestUnixDomainWSGIServer(base.BaseTestCase):
|
||||||
'app',
|
'app',
|
||||||
protocol=utils.UnixDomainHttpProtocol,
|
protocol=utils.UnixDomainHttpProtocol,
|
||||||
log=mock.ANY,
|
log=mock.ANY,
|
||||||
|
log_format=cfg.CONF.wsgi_log_format,
|
||||||
max_size=self.server.num_threads
|
max_size=self.server.num_threads
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -527,5 +529,6 @@ class TestUnixDomainWSGIServer(base.BaseTestCase):
|
||||||
'app',
|
'app',
|
||||||
protocol=utils.UnixDomainHttpProtocol,
|
protocol=utils.UnixDomainHttpProtocol,
|
||||||
log=mock.ANY,
|
log=mock.ANY,
|
||||||
|
log_format=cfg.CONF.wsgi_log_format,
|
||||||
max_size=num_threads
|
max_size=num_threads
|
||||||
)
|
)
|
||||||
|
|
|
@ -205,6 +205,7 @@ class TestWSGIServer(base.BaseTestCase):
|
||||||
max_size=server.num_threads,
|
max_size=server.num_threads,
|
||||||
log=mock.ANY,
|
log=mock.ANY,
|
||||||
keepalive=CONF.wsgi_keep_alive,
|
keepalive=CONF.wsgi_keep_alive,
|
||||||
|
log_format=CONF.wsgi_log_format,
|
||||||
socket_timeout=server.client_socket_timeout
|
socket_timeout=server.client_socket_timeout
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -221,6 +221,7 @@ class Server(object):
|
||||||
max_size=self.num_threads,
|
max_size=self.num_threads,
|
||||||
log=LOG,
|
log=LOG,
|
||||||
keepalive=CONF.wsgi_keep_alive,
|
keepalive=CONF.wsgi_keep_alive,
|
||||||
|
log_format=CONF.wsgi_log_format,
|
||||||
socket_timeout=self.client_socket_timeout)
|
socket_timeout=self.client_socket_timeout)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue