airship
/
armada
Code Issues Proposed changes

[DNM] test 

Change-Id: I8ad762dd94d60b2f07423b27baaa2c1ec1e5a036
This commit is contained in:
Ruslan Aliev 2023-07-16 17:57:12 -05:00
parent 812546c875
commit 1f4855263e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
armada/api/middleware.py
View File

@ -104,7 +104,7 @@ class LoggingMiddleware(object):
self.logger = logging.getLogger(__name__)
# don't log any headers beginning with X-*
hdr_exclude = re.compile('x-.*', re.IGNORECASE)
#hdr_exclude = re.compile('x-.*', re.IGNORECASE)
# don't log anything for health checks
path_exclude = re.compile('.*/({}|{})$'.format(HEALTH_PATH, METRICS_PATH))
@ -131,6 +131,7 @@ class LoggingMiddleware(object):
"user=%s request_id=%s ext_ctx=%s end_user=%s Request: %s %s %s",
user or '-', req_id or '-', external_ctx or '-', end_user or '-',
req.method, req.uri, req.query_string)
self.logger.info("whole ctx: %s", vars(ctx))
self._log_headers(req.headers)
@ -155,12 +156,18 @@ class LoggingMiddleware(object):
"user=%s request_id=%s ext_ctx=%s end_user=%s Response: %s %s %s",
user or '-', req_id or '-', external_ctx or '-', end_user or '-',
req.method, req.uri, resp.status)
self.logger.info("whole ctx: %s", vars(ctx))
self.logger.info("Resp headers:")
self._log_headers(resp.headers)
self.logger.debug("Response text:%s", resp.text)
self.logger.info("Req headers:")
self._log_headers(req.headers)
def _log_headers(self, headers):
""" Log request headers, while scrubbing sensitive values
"""
for header, header_value in headers.items():
if not LoggingMiddleware.hdr_exclude.match(header):
self.logger.debug("Header %s: %s", header, header_value)
#if not LoggingMiddleware.hdr_exclude.match(header):
self.logger.debug("Header %s: %s", header, header_value)

1
armada/api/server.py
View File

@ -48,6 +48,7 @@ def create(enable_middleware=CONF.middleware):
api = falcon.App(
request_type=ArmadaRequest,
middleware=[
LoggingMiddleware(),
AuthMiddleware(),
ContextMiddleware(),
LoggingMiddleware(),