Align access log format across protocols

emmett-framework · May 24, 2024 · e0133b8 · e0133b8
1 parent 564d1ae
commit e0133b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/granian/asgi.py b/granian/asgi.py
@@ -139,8 +139,8 @@ def access_log(t, scope, resp_code):
         logger(
             t,
             {
-                'addr_remote': scope['client'],
-                'protocol': scope['http_version'],
+                'addr_remote': scope['client'][0],
+                'protocol': 'HTTP/' + scope['http_version'],
                 'path': scope['path'],
                 'qs': scope['query_string'],
                 'method': scope['method'],

diff --git a/granian/rsgi.py b/granian/rsgi.py
@@ -101,8 +101,8 @@ def access_log(t, scope, resp_code):
         logger(
             t,
             {
-                'addr_remote': scope.client,
-                'protocol': scope.http_version,
+                'addr_remote': scope.client.split(':')[0],
+                'protocol': 'HTTP/' + scope.http_version,
                 'path': scope.path,
                 'qs': scope.query_string,
                 'method': scope.method,

diff --git a/granian/server.py b/granian/server.py
@@ -85,7 +85,7 @@ def __init__(
         log_level: LogLevels = LogLevels.info,
         log_dictconfig: Optional[Dict[str, Any]] = None,
         log_access: bool = False,
-        log_access_format: str = DEFAULT_ACCESSLOG_FMT,
+        log_access_format: Optional[str] = None,
         ssl_cert: Optional[Path] = None,
         ssl_key: Optional[Path] = None,
         url_path_prefix: Optional[str] = None,
@@ -113,7 +113,7 @@ def __init__(
         self.log_level = log_level
         self.log_config = log_dictconfig
         self.log_access = log_access
-        self.log_access_format = log_access_format
+        self.log_access_format = log_access_format or DEFAULT_ACCESSLOG_FMT
         self.url_path_prefix = url_path_prefix
         self.respawn_failed_workers = respawn_failed_workers
         self.reload_on_changes = reload

diff --git a/granian/wsgi.py b/granian/wsgi.py
@@ -71,7 +71,7 @@ def access_log(t, scope, resp_code):
         logger(
             t,
             {
-                'addr_remote': scope['REMOTE_ADDR'],
+                'addr_remote': scope['REMOTE_ADDR'].split(':')[0],
                 'protocol': scope['SERVER_PROTOCOL'],
                 'path': scope['PATH_INFO'],
                 'qs': scope['QUERY_STRING'],