internal 1.0.108__tar.gz → 1.0.110__tar.gz

{internal-1.0.108 → internal-1.0.110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.0.108
+Version: 1.0.110
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.0.108 → internal-1.0.110}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.0.108"
+version = "1.0.110"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.0.108 → internal-1.0.110}/src/internal/base_factory.py

@@ -1,12 +1,11 @@
 import logging
-import logging.config
 import logging.handlers
 import os
 import traceback
 from abc import ABCMeta, abstractmethod
 from contextlib import asynccontextmanager
 from functools import lru_cache
-from asgi_correlation_id import CorrelationIdMiddleware
+from asgi_correlation_id import CorrelationIdMiddleware, CorrelationIdFilter
 
 import dotenv
 import watchtower
@@ -22,7 +21,6 @@ from .exception.internal_exception import BadGatewayException, GatewayTimeoutExc
 from .ext.amazon import aws
 from .http.requests import async_request
 from .http.responses import async_response
-from .log_config import LOGGING
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
 
@@ -233,12 +231,12 @@ class BaseFactory(metaclass=ABCMeta):
 
     #
     def __setup_logger(self, app, logger_name, level=logging.INFO):
-        logging.config.dictConfig(LOGGING)
         logger = logging.getLogger(logger_name)
         logger.setLevel(level)
 
         stream_handler = logging.StreamHandler()
         stream_handler.setFormatter(logging.Formatter(fmt=LOG_FMT))
+        stream_handler.addFilter(CorrelationIdFilter())
         logger.addHandler(stream_handler)
 
         return logger
@@ -250,6 +248,7 @@ class BaseFactory(metaclass=ABCMeta):
                 log_group_name=self.get_app_config().AWS_LOGGROUP_NAME,
                 boto3_client=logs_client, create_log_group=False)
             watchtower_handler.setFormatter(logging.Formatter(fmt=LOG_FMT_NO_DT, datefmt=LOG_DT_FMT))
+            watchtower_handler.addFilter(CorrelationIdFilter())
             app.state.logger.addHandler(watchtower_handler)
 
     def __init_builtin_api(self, app):

internal-1.0.108/src/internal/log_config.py

@@ -1,32 +0,0 @@
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'correlation_id': {
-            '()': 'asgi_correlation_id.CorrelationIdFilter',
-            'uuid_length': 32,
-            'default_value': '-',
-        },
-    },
-    'formatters': {
-        'web': {
-            'class': 'logging.Formatter',
-            'datefmt': '%H:%M:%S',
-            'format': '%(levelname)s ... [%(correlation_id)s] %(name)s %(message)s',
-        },
-    },
-    'handlers': {
-        'web': {
-            'class': 'logging.StreamHandler',
-            'filters': ['correlation_id'],
-            'formatter': 'web',
-        },
-    },
-    'loggers': {
-        'my_project': {
-            'handlers': ['web'],
-            'level': 'DEBUG',
-            'propagate': True,
-        },
-    },
-}