izihawa-loglib 1.1.18__tar.gz → 1.1.20__tar.gz

{izihawa_loglib-1.1.18 → izihawa_loglib-1.1.20}/PKG-INFO

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

{izihawa_loglib-1.1.18 → izihawa_loglib-1.1.20}/izihawa_loglib/formatters.py

@@ -37,8 +37,9 @@ class DefaultHttpFormatter(BaseFormatter):
         formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(
             DATETIME_FORMAT
         )
-        client_ip = getattr(record, "client_ip", None)
+        real_ip = getattr(record, "real_ip", None)
         request_id = getattr(record, "request_id", None)
+        client_id = getattr(record, "client_id", None)
         method = getattr(record, "method", None)
         path = getattr(record, "path", None)
 
@@ -49,10 +50,12 @@ class DefaultHttpFormatter(BaseFormatter):
             process=os.getpid(),
         )
 
-        if client_ip:
-            log_record["client_ip"] = client_ip
+        if real_ip:
+            log_record["real_ip"] = real_ip
         if request_id:
             log_record["request_id"] = request_id
+        if client_id:
+            log_record["client_id"] = client_id
         if method:
             log_record["method"] = method
         if path:

{izihawa_loglib-1.1.18 → izihawa_loglib-1.1.20}/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.18 → izihawa_loglib-1.1.20}/pyproject.toml

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