openstack/ironic
Code Issues Proposed changes

API service logs access requests again

Browse Source 
The API service used to log access requests, as is customary for API
services. However, commit c4bd20ebd4b42201bf40e00d4f0a1b2c69d2e931
unintentionally changed this behavior when changing over to use
oslo_service.

This commit causes ironic-api to resume logging access requests, now
with all the additional information that oslo_service provides, by
changing the logger_name to the service name (instead of the default,
which was being filtered out).

Change-Id: I5855d4d2bd9eb70bf5f77fb2dc8c712f74304a07
Closes-bug: #1536828
This commit is contained in:
Devananda van der Veen 2016-01-21 15:27:07 -08:00
parent a755e78986
commit 2173649d48
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/common/service.py
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.

15
ironic/tests/unit/common/test_service.py
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)

4
releasenotes/notes/fix-api-access-logs-68b9ca4f411f339c.yaml Normal file
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.