Merge "API service logs access requests again"

This commit is contained in:
Jenkins 2016-01-28 05:32:27 +00:00 committed by Gerrit Code Review
commit ffebab419b
3 changed files with 18 additions and 4 deletions

View File

@ -170,7 +170,8 @@ class WSGIService(service.ServiceBase):
self.server = wsgi.Server(CONF, name, self.app,
host=CONF.api.host_ip,
port=CONF.api.port,
use_ssl=use_ssl)
use_ssl=use_ssl,
logger_name=name)
def start(self):
"""Start serving this service using loaded configuration.

View File

@ -24,9 +24,16 @@ CONF = cfg.CONF
class TestWSGIService(base.TestCase):
@mock.patch.object(service.wsgi, 'Server')
def test_workers_set_default(self, wsgi_server):
test_service = service.WSGIService("ironic_api")
service_name = "ironic_api"
test_service = service.WSGIService(service_name)
self.assertEqual(processutils.get_worker_count(),
test_service.workers)
wsgi_server.assert_called_once_with(CONF, service_name,
test_service.app,
host='0.0.0.0',
port=6385,
use_ssl=False,
logger_name=service_name)
@mock.patch.object(service.wsgi, 'Server')
def test_workers_set_correct_setting(self, wsgi_server):
@ -51,9 +58,11 @@ class TestWSGIService(base.TestCase):
@mock.patch.object(service.wsgi, 'Server')
def test_wsgi_service_with_ssl_enabled(self, wsgi_server):
self.config(enable_ssl_api=True, group='api')
service_name = 'ironic_api'
srv = service.WSGIService('ironic_api', CONF.api.enable_ssl_api)
wsgi_server.assert_called_once_with(CONF, 'ironic_api',
wsgi_server.assert_called_once_with(CONF, service_name,
srv.app,
host='0.0.0.0',
port=6385,
use_ssl=True)
use_ssl=True,
logger_name=service_name)

View File

@ -0,0 +1,4 @@
---
fixes:
- API service once again records HTTP access logs. See
https://bugs.launchpad.net/ironic/+bug/1536828 for details.