izihawa-loglib 1.1.15__tar.gz → 1.1.17__tar.gz

{izihawa_loglib-1.1.15 → izihawa_loglib-1.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: izihawa_loglib
-Version: 1.1.15
+Version: 1.1.17
 Summary: Izihawa log utilities
 Author: Pasha Podolsky
 Author-email: ppodolsky@me.com

{izihawa_loglib-1.1.15 → izihawa_loglib-1.1.17}/izihawa_loglib/formatters.py

@@ -16,13 +16,19 @@ DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
 class BaseFormatter(logging.Formatter):
     def _prepare(self, record):
         if isinstance(record.msg, BaseError):
-            return record.msg.as_internal_dict()
+            d = record.msg.as_internal_dict()
         elif isinstance(record.msg, typing.Dict) or dataclasses.is_dataclass(
             record.msg
         ):
-            return record.msg
+            d = record.msg
         else:
-            return dict(message=super().format(record))
+            d = dict(message=super().format(record))
+
+        client_ip = getattr(record, "client_ip", None)
+        if client_ip:
+            d["client_ip"] = str(client_ip)
+
+        return d
 
     def format(self, record):
         log_record = self._prepare(record)
@@ -37,7 +43,6 @@ class DefaultHttpFormatter(BaseFormatter):
         formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(
             DATETIME_FORMAT
         )
-        client_ip = getattr(record, "client_ip", None)
         request_id = getattr(record, "request_id", None)
         method = getattr(record, "method", None)
         path = getattr(record, "path", None)
@@ -49,8 +54,6 @@ class DefaultHttpFormatter(BaseFormatter):
             process=os.getpid(),
         )
 
-        if client_ip:
-            log_record["client_ip"] = client_ip
         if request_id:
             log_record["request_id"] = request_id
         if method:

{izihawa_loglib-1.1.15 → izihawa_loglib-1.1.17}/izihawa_loglib/request_context.py

@@ -9,7 +9,7 @@ class RequestContext:
     request_id_length: int = 12
 
     def __init__(
-        self, **kwargs: dict[str, Any],
+        self, **kwargs: Any,
     ):
         self.default_fields = kwargs
         if not self.default_fields.get("request_id"):
@@ -29,16 +29,16 @@ class RequestContext:
     def generate_request_id(length):
         return generate_request_id(length)
 
-    def add_default_fields(self, **fields: dict) -> None:
+    def add_default_fields(self, **fields: Any) -> None:
         self.default_fields.update(fields)
 
-    def statbox(self, **kwargs: dict) -> None:
+    def statbox(self, **kwargs: Any) -> None:
         logging.getLogger("statbox").info(msg={**self.default_fields, **kwargs})
 
-    def user_log(self, **kwargs: dict) -> None:
+    def user_log(self, **kwargs: Any) -> None:
         logging.getLogger("user").info(msg={**self.default_fields, **kwargs})
 
-    def debug_log(self, **kwargs: dict) -> None:
+    def debug_log(self, **kwargs: Any) -> None:
         logging.getLogger("debug").debug(msg={**self.default_fields, **kwargs})
 
     def error_log(self, e, level=logging.ERROR, **fields) -> None:

{izihawa_loglib-1.1.15 → izihawa_loglib-1.1.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "izihawa_loglib"
-version = "1.1.15"
+version = "1.1.17"
 description = "Izihawa log utilities"
 authors = ["Pasha Podolsky <ppodolsky@me.com>"]
 readme = "README.md"