izihawa-loglib 1.0.1__py3-none-any.whl → 1.1.1__py3-none-any.whl

izihawa_loglib/__init__.py

@@ -5,33 +5,30 @@ import sys
 from izihawa_utils.exceptions import BaseError
 from izihawa_utils.file import mkdir_p
 
-from .formatters import DefaultFormatter, DefaultHttpFormatter
 from .handlers import QueueHandler
 
 
-def configure_logging(config, make_path=True):
-    if config.get('application', {}).get('debug', False) or 'logging' not in config:
-        logging.basicConfig(stream=sys.stdout, level=logging.INFO)
+def configure_logging(config: dict, make_path: bool = False, default_level=logging.INFO):
+    if config.get("application", {}).get("debug", False) or "logging" not in config:
+        logging.basicConfig(stream=sys.stdout, level=default_level)
     else:
         if make_path:
-            mkdir_p(config['log_path'])
-        logging.config.dictConfig(config['logging'])
+            mkdir_p(config["log_path"])
+        logging.config.dictConfig(config["logging"])
 
 
 def error_log(e, level=logging.ERROR, **fields):
-    level = getattr(e, 'level', level)
+    level = getattr(e, "level", level)
     if isinstance(e, BaseError):
         e = e.as_internal_dict()
         e.update(fields)
     elif fields:
-        e = {'error': repr(e), **fields}
-    logging.getLogger('error').log(
-        msg=str(e),
-        level=level
-    )
+        e = {"error": repr(e), **fields}
+    logging.getLogger("error").log(msg=str(e), level=level)
 
 
 __all__ = [
-    'DefaultFormatter', 'DefaultHttpFormatter',
-    'QueueHandler', 'configure_logging', 'error_log',
+    "QueueHandler",
+    "configure_logging",
+    "error_log",
 ]

izihawa_loglib/formatters.py

@@ -10,14 +10,16 @@ import typing
 import orjson as json
 from izihawa_utils.exceptions import BaseError
 
-DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S.%f'
+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()
-        elif isinstance(record.msg, typing.Dict) or dataclasses.is_dataclass(record.msg):
+        elif isinstance(record.msg, typing.Dict) or dataclasses.is_dataclass(
+            record.msg
+        ):
             return record.msg
         else:
             return dict(message=super().format(record))
@@ -32,11 +34,13 @@ class DefaultHttpFormatter(BaseFormatter):
         log_record = super()._prepare(record)
 
         timestamp = time.time()
-        formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(DATETIME_FORMAT)
-        user_ip = getattr(record, 'user_ip', None)
-        request_id = getattr(record, 'request_id', None)
-        method = getattr(record, 'method', None)
-        path = getattr(record, 'path', None)
+        formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(
+            DATETIME_FORMAT
+        )
+        user_ip = getattr(record, "user_ip", None)
+        request_id = getattr(record, "request_id", None)
+        method = getattr(record, "method", None)
+        path = getattr(record, "path", None)
 
         log_record.update(
             unixtime=int(timestamp),
@@ -46,13 +50,13 @@ class DefaultHttpFormatter(BaseFormatter):
         )
 
         if user_ip:
-            log_record['user_ip'] = user_ip
+            log_record["user_ip"] = user_ip
         if request_id:
-            log_record['request_id'] = request_id
+            log_record["request_id"] = request_id
         if method:
-            log_record['method'] = method
+            log_record["method"] = method
         if path:
-            log_record['path'] = path
+            log_record["path"] = path
 
         return log_record
 
@@ -66,7 +70,9 @@ class DefaultFormatter(BaseFormatter):
         log_record = super()._prepare(record)
 
         timestamp = time.time()
-        formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(DATETIME_FORMAT)
+        formatted_datetime = datetime.datetime.fromtimestamp(timestamp).strftime(
+            DATETIME_FORMAT
+        )
 
         log_record.update(
             unixtime=int(timestamp),
@@ -86,7 +92,7 @@ class TracebackFormatter(DefaultFormatter):
         log_record = self._prepare(record)
         value = pprint.pformat(log_record, indent=2)
         if traceback.sys.exc_info()[0] is not None:
-            value += '\n' + traceback.format_exc()
+            value += "\n" + traceback.format_exc()
         return value
 
 

izihawa_loglib/handlers.py

@@ -8,8 +8,10 @@ from izihawa_types.var import varstr
 class QueueHandler(logging.handlers.QueueHandler):
     def __init__(self, *handlers):
         self._queue = queue.Queue(-1)
-        self._listener = logging.handlers.QueueListener(self._queue, *handlers, respect_handler_level=True)
-        self.setLevel('INFO')
+        self._listener = logging.handlers.QueueListener(
+            self._queue, *handlers, respect_handler_level=True
+        )
+        self.setLevel("INFO")
 
         super().__init__(self._queue)
         self._listener.start()
@@ -30,7 +32,7 @@ class BaseFileHandler(logging.handlers.WatchedFileHandler):
 
 class BaseBinaryFileHandler(BaseFileHandler):
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs, mode='ab+')
+        super().__init__(*args, **kwargs, mode="ab+")
 
     def emit(self, record):
         try:

izihawa_loglib-1.1.1.dist-info/METADATA

@@ -0,0 +1,20 @@
+Metadata-Version: 2.1
+Name: izihawa_loglib
+Version: 1.1.1
+Summary: Izihawa log utilities
+Author: Pasha Podolsky
+Author-email: ppodolsky@me.com
+Requires-Python: >=3.8.1,<3.13
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: confuse (>=2.0.1,<3.0.0)
+Requires-Dist: izihawa-types (>=0.1.4,<0.2.0)
+Requires-Dist: izihawa-utils (>=1.2.1,<2.0.0)
+Requires-Dist: orjson (>=3.9.10,<4.0.0)
+Description-Content-Type: text/markdown
+
+# izihawa_netlib
+

izihawa_loglib-1.1.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+izihawa_loglib/__init__.py,sha256=qrxMsrTCPI8_CmvEGdhNliUKSQwkHD3RpZsp5smynQk,918
+izihawa_loglib/formatters.py,sha256=ZQj0FMJs4qJcaFKz__VSsrUGXgMcXhQKSTAqemWYZG8,2816
+izihawa_loglib/handlers.py,sha256=UMBb7VSFvo4QUD0aueyzmh2ryq5tl8U4iKB9IIbax-0,1095
+izihawa_loglib-1.1.1.dist-info/METADATA,sha256=SH9-fOUV96pbnP5DvkFprf-s6EcxhmWuUTimT2ErfxY,656
+izihawa_loglib-1.1.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+izihawa_loglib-1.1.1.dist-info/RECORD,,

{izihawa_loglib-1.0.1.dist-info → izihawa_loglib-1.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: bazel-wheelmaker 1.0
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any

izihawa_loglib-1.0.1.dist-info/METADATA

@@ -1,14 +0,0 @@
-Metadata-Version: 2.1
-Name: izihawa-loglib
-Version: 1.0.1
-Author: Pasha Podolsky
-Author-email: ppodolsky@me.com
-Home-page: https://github.com/izihawa/loglib
-License: MIT License
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.8
-Requires-Dist: izihawa-types
-Requires-Dist: izihawa-utils >= 1.0.2
-Requires-Dist: orjson >= 3.6.8
-
-UNKNOWN

izihawa_loglib-1.0.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-izihawa_loglib-1.0.1.dist-info/METADATA,sha256=dnPc51xBz3833r-pCsdh13sm-1QME52dDxN5u7xmxmE,358
-izihawa_loglib-1.0.1.dist-info/RECORD,,
-izihawa_loglib-1.0.1.dist-info/WHEEL,sha256=sobxWSyDDkdg_rinUth-jxhXHqoNqlmNMJY3aTZn2Us,91
-izihawa_loglib/__init__.py,sha256=Ato6-AjQ7I0QmVJNB2Qbic66WGeNtexar0lxl05i3gI,999
-izihawa_loglib/formatters.py,sha256=fFpNdF9PjsW9sQgVDVwVfmFPnKkrbo1RTMvYxFRH114,2750
-izihawa_loglib/handlers.py,sha256=PLqgMnP6Mvb9btW7iRtI5PGCRocTLeiYW5QaiNOEuzk,1073