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

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

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

{izihawa_loglib-1.1.19 → izihawa_loglib-1.1.21}/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.19 → izihawa_loglib-1.1.21}/izihawa_loglib/request_context.py

@@ -1,4 +1,5 @@
 import logging
+import typing
 from typing import Any
 
 from izihawa_loglib import error_log
@@ -13,6 +14,7 @@ class RequestContext:
         **kwargs: Any,
     ):
         self.default_fields = kwargs
+        self.context_fields = {}
         if not self.default_fields.get("request_id"):
             self.default_fields["request_id"] = RequestContext.generate_request_id(
                 self.request_id_length
@@ -22,9 +24,12 @@ class RequestContext:
         try:
             return self.default_fields[name]
         except KeyError:
-            classname = type(self).__name__
-            msg = f"{classname!r} object has no attribute {name!r}"
-            raise AttributeError(msg)
+            try:
+                return self.context_fields[name]
+            except KeyError:
+                classname = type(self).__name__
+                msg = f"{classname!r} object has no attribute {name!r}"
+                raise AttributeError(msg)
 
     @staticmethod
     def generate_request_id(length):
@@ -33,6 +38,9 @@ class RequestContext:
     def add_default_fields(self, **fields: Any) -> None:
         self.default_fields.update(fields)
 
+    def add_context_fields(self, **fields: Any) -> None:
+        self.context_fields.update(fields)
+
     def statbox(self, **kwargs: Any) -> None:
         logging.getLogger("statbox").info(msg={**self.default_fields, **kwargs})
 

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

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