openstack/horizon
Code Issues Proposed changes

Merge "Fix operation_log middleware tests"

Browse Source
This commit is contained in:
Jenkins 2017-07-06 09:09:30 +00:00 committed by Gerrit Code Review
commit b7a9754d3c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/middleware/operation_log.py
View File

@ -60,7 +60,7 @@ class OperationLogMiddleware(object):
_log_option = getattr(settings, "OPERATION_LOG_OPTIONS", {})
_available_methods = ['POST', 'GET', 'PUT', 'DELETE']
_methods = _log_option.get("target_methods", ['POST'])
_default_format = (
self._default_format = (
"[%(client_ip)s] [%(domain_name)s]"
" [%(domain_id)s] [%(project_name)s]"
" [%(project_id)s] [%(user_name)s] [%(user_id)s]"
@ -69,7 +69,7 @@ class OperationLogMiddleware(object):
_default_ignored_urls = ['/js/', '/static/', '^/api/']
self.target_methods = [x for x in _methods if x in _available_methods]
self.mask_fields = _log_option.get("mask_fields", ['password'])
self.format = _log_option.get("format", _default_format)
self.format = _log_option.get("format", self._default_format)
self._logger = logging.getLogger('horizon.operation_log')
ignored_urls = _log_option.get("ignore_urls", _default_ignored_urls)

3
horizon/test/tests/middleware.py
View File

@ -196,6 +196,7 @@ class OperationLogMiddlewareTest(test.TestCase):
self.assertIn(data, logging_str)
@override_settings(OPERATION_LOG_ENABLED=True)
@override_settings(OPERATION_LOG_OPTIONS={'target_methods': ['GET']})
@patch(('horizon.middleware.operation_log.OperationLogMiddleware.'
'OPERATION_LOG'))
def test_get_log_format(self, mock_logger):
@ -210,7 +211,7 @@ class OperationLogMiddlewareTest(test.TestCase):
def test_get_log_format_no_user(self, mock_logger):
olm = middleware.OperationLogMiddleware()
request, _ = self._test_ready_for_get()
request.delattr("user")
delattr(request, "user")
self.assertIsNone(olm._get_log_format(request))