beans-logging-fastapi 1.0.2__tar.gz → 1.1.1__tar.gz

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: beans_logging_fastapi
-Version: 1.0.2
+Version: 1.1.1
 Summary: 'beans_logging_fastapi' is a middleware for FastAPI to log HTTP access. It is based on 'beans-logging' package.
 Home-page: https://github.com/bybatkhuu/module.fastapi-logging
-Download-URL: https://github.com/bybatkhuu/module.fastapi-logging/archive/v1.0.2.tar.gz
+Download-URL: https://github.com/bybatkhuu/module.fastapi-logging/archive/v1.1.1.tar.gz
 Author: Batkhuu Byambajav
 Author-email: batkhuu10@gmail.com
 License: MIT
@@ -170,6 +170,7 @@ logger:
     http_std_msg_format: '<n><w>[{request_id}]</w></n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}" {status_code} {content_length}B {response_time}ms'
     http_file_enabled: true
     http_file_format: '{client_host} {request_id} {user_id} [{datetime}] "{method} {url_path} HTTP/{http_version}" {status_code} {content_length} "{h_referer}" "{h_user_agent}" {response_time}'
+    http_file_tz: "localtime"
     http_log_path: "http/{app_name}.http.access.log"
     http_err_path: "http/{app_name}.http.err.log"
     http_json_enabled: true
@@ -204,7 +205,9 @@ logger: Logger = logger_loader.load()
 
 def _http_file_format(record: dict) -> str:
     _format = http_file_format(
-        record=record, msg_format=logger_loader.config.extra.http_file_format
+        record=record,
+        msg_format=logger_loader.config.extra.http_file_format,
+        tz=logger_loader.config.extra.http_file_tz,
     )
     return _format
 

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/README.md

@@ -146,6 +146,7 @@ logger:
     http_std_msg_format: '<n><w>[{request_id}]</w></n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}" {status_code} {content_length}B {response_time}ms'
     http_file_enabled: true
     http_file_format: '{client_host} {request_id} {user_id} [{datetime}] "{method} {url_path} HTTP/{http_version}" {status_code} {content_length} "{h_referer}" "{h_user_agent}" {response_time}'
+    http_file_tz: "localtime"
     http_log_path: "http/{app_name}.http.access.log"
     http_err_path: "http/{app_name}.http.err.log"
     http_json_enabled: true
@@ -180,7 +181,9 @@ logger: Logger = logger_loader.load()
 
 def _http_file_format(record: dict) -> str:
     _format = http_file_format(
-        record=record, msg_format=logger_loader.config.extra.http_file_format
+        record=record,
+        msg_format=logger_loader.config.extra.http_file_format,
+        tz=logger_loader.config.extra.http_file_tz,
     )
     return _format
 

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/beans_logging_fastapi/__version__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.0.2"
+__version__ = "1.1.1"

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/beans_logging_fastapi/_formats.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 
 from typing import Dict, Any
+from zoneinfo import ZoneInfo
 
 
 def http_file_format(
     record: dict,
     msg_format: str = '{client_host} {request_id} {user_id} [{datetime}] "{method} {url_path} HTTP/{http_version}" {status_code} {content_length} "{h_referer}" "{h_user_agent}" {response_time}',
+    tz: str = "localtime",
 ) -> str:
     """Http access log file format.
 
@@ -22,7 +24,14 @@ def http_file_format(
     if "http_message" not in record:
         _http_info: Dict[str, Any] = record["extra"]["http_info"]
         if "datetime" not in _http_info:
-            _http_info["datetime"] = record["time"].isoformat(timespec="milliseconds")
+            _dt = record["time"]
+            if tz != "localtime":
+                if not _dt.tzinfo:
+                    _dt = _dt.replace(tzinfo=ZoneInfo("UTC"))
+
+                _dt = _dt.astimezone(ZoneInfo(tz))
+
+            _http_info["datetime"] = _dt.isoformat(timespec="milliseconds")
 
         if "content_length" not in _http_info:
             _http_info["content_length"] = 0

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/beans_logging_fastapi/_middlewares.py

@@ -137,6 +137,8 @@ class RequestHTTPInfoMiddleware(BaseHTTPMiddleware):
             _http_info["url_path"] = _http_info["url_path"].replace("{", "{{")
         if "}" in _http_info["url_path"]:
             _http_info["url_path"] = _http_info["url_path"].replace("}", "}}")
+        if "<" in _http_info["url_path"]:
+            _http_info["url_path"] = _http_info["url_path"].replace("<", "\<")
         if request.url.query:
             _http_info["url_path"] = f"{request.url.path}?{request.url.query}"
 

{beans_logging_fastapi-1.0.2 → beans_logging_fastapi-1.1.1}/beans_logging_fastapi.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: beans-logging-fastapi
-Version: 1.0.2
+Version: 1.1.1
 Summary: 'beans_logging_fastapi' is a middleware for FastAPI to log HTTP access. It is based on 'beans-logging' package.
 Home-page: https://github.com/bybatkhuu/module.fastapi-logging
-Download-URL: https://github.com/bybatkhuu/module.fastapi-logging/archive/v1.0.2.tar.gz
+Download-URL: https://github.com/bybatkhuu/module.fastapi-logging/archive/v1.1.1.tar.gz
 Author: Batkhuu Byambajav
 Author-email: batkhuu10@gmail.com
 License: MIT
@@ -170,6 +170,7 @@ logger:
     http_std_msg_format: '<n><w>[{request_id}]</w></n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}" {status_code} {content_length}B {response_time}ms'
     http_file_enabled: true
     http_file_format: '{client_host} {request_id} {user_id} [{datetime}] "{method} {url_path} HTTP/{http_version}" {status_code} {content_length} "{h_referer}" "{h_user_agent}" {response_time}'
+    http_file_tz: "localtime"
     http_log_path: "http/{app_name}.http.access.log"
     http_err_path: "http/{app_name}.http.err.log"
     http_json_enabled: true
@@ -204,7 +205,9 @@ logger: Logger = logger_loader.load()
 
 def _http_file_format(record: dict) -> str:
     _format = http_file_format(
-        record=record, msg_format=logger_loader.config.extra.http_file_format
+        record=record,
+        msg_format=logger_loader.config.extra.http_file_format,
+        tz=logger_loader.config.extra.http_file_tz,
     )
     return _format