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

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

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

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

@@ -16,19 +16,13 @@ DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
 class BaseFormatter(logging.Formatter):
     def _prepare(self, record):
         if isinstance(record.msg, BaseError):
-            d = record.msg.as_internal_dict()
+            return record.msg.as_internal_dict()
         elif isinstance(record.msg, typing.Dict) or dataclasses.is_dataclass(
             record.msg
         ):
-            d = record.msg
+            return record.msg
         else:
-            d = dict(message=super().format(record))
-
-        client_ip = getattr(record, "client_ip", None)
-        if client_ip:
-            d["client_ip"] = str(client_ip)
-
-        return d
+            return dict(message=super().format(record))
 
     def format(self, record):
         log_record = self._prepare(record)
@@ -43,6 +37,7 @@ 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)
@@ -54,6 +49,8 @@ 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:
@@ -76,7 +73,6 @@ class DefaultFormatter(BaseFormatter):
         formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(
             DATETIME_FORMAT
         )
-
         log_record.update(
             unixtime=int(timestamp),
             timestamp=int(timestamp * 1_000_000),
@@ -87,7 +83,7 @@ class DefaultFormatter(BaseFormatter):
 
     def format(self, record):
         log_record = self._prepare(record)
-        return json.dumps(log_record).decode()
+        return json.dumps(log_record, default=str).decode()
 
 
 class TracebackFormatter(DefaultFormatter):

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

@@ -9,7 +9,8 @@ class RequestContext:
     request_id_length: int = 12
 
     def __init__(
-        self, **kwargs: Any,
+        self,
+        **kwargs: Any,
     ):
         self.default_fields = kwargs
         if not self.default_fields.get("request_id"):
@@ -22,7 +23,7 @@ class RequestContext:
             return self.default_fields[name]
         except KeyError:
             classname = type(self).__name__
-            msg = f'{classname!r} object has no attribute {name!r}'
+            msg = f"{classname!r} object has no attribute {name!r}"
             raise AttributeError(msg)
 
     @staticmethod
@@ -44,11 +45,3 @@ class RequestContext:
     def error_log(self, e, level=logging.ERROR, **fields) -> None:
         all_fields = {**self.default_fields, **fields}
         error_log(e, level=level, **all_fields)
-
-    def to_default_headers(self) -> dict[str, Any]:
-        headers = {}
-        if request_id := self.default_fields.get("request_id"):
-            headers["X-Request-Id"] = request_id
-        if client_id := self.default_fields.get("client_id"):
-            headers["X-Client-Id"] = client_id
-        return headers

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

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