refactor(logging): update header priority for client identification

Changed the priority of headers for client identification in logs:
Now prioritizing the 'Remote-User' header over the 'X-Client-ID' header.
This commit is contained in:
Mose Müller 2025-01-20 06:29:57 +01:00
parent 045334e51e
commit 9b2d181f4a
3 changed files with 7 additions and 7 deletions

View File

@ -97,10 +97,10 @@ def get_log_id(request: aiohttp.web.Request) -> str:
client_id_header = request.headers.get("x-client-id", None)
remote_username_header = request.headers.get("remote-user", None)
if client_id_header is not None:
log_id = f"id={click.style(client_id_header, fg='cyan')}"
elif remote_username_header is not None:
if remote_username_header is not None:
log_id = f"user={click.style(remote_username_header, fg='cyan')}"
elif client_id_header is not None:
log_id = f"id={click.style(client_id_header, fg='cyan')}"
else:
log_id = f"id={click.style(None, fg='cyan')}"

View File

@ -144,10 +144,10 @@ def setup_sio_events(sio: socketio.AsyncServer, state_manager: StateManager) ->
client_id_header = environ.get("HTTP_X_CLIENT_ID", None)
remote_username_header = environ.get("HTTP_REMOTE_USER", None)
if client_id_header is not None:
log_id = f"id={click.style(client_id_header, fg='cyan')}"
elif remote_username_header is not None:
if remote_username_header is not None:
log_id = f"user={click.style(remote_username_header, fg='cyan')}"
elif client_id_header is not None:
log_id = f"id={click.style(client_id_header, fg='cyan')}"
else:
log_id = f"sid={click.style(sid, fg='cyan')}"

View File

@ -274,7 +274,7 @@ async def test_trigger_method(
"X-Client-Id": "client-header",
"Remote-User": "Remote User",
},
"id=client-header",
"user=Remote User",
),
],
)