Merge pull request #23 from bybatkhuu/develop

🐛 Fixed message with brackets '{}' error.

Author: bybatkhuu

beans_logging/_base.py

@@ -552,20 +552,22 @@ def _load_intercept_handlers(self):
                 ):
                     _logger = logging.getLogger(_module_name)
                     _logger.handlers = [_intercept_handler]
+                    _logger.propagate = False
                     _intercepted_modules.add(_module_name)
 
         for _include_module_name in self.config.intercept.include_modules:
             _logger = logging.getLogger(_include_module_name)
             _logger.handlers = [_intercept_handler]
+            logger.propagate = False
 
             if _include_module_name not in _intercepted_modules:
                 _intercepted_modules.add(_include_module_name)
 
         for _mute_module_name in self.config.intercept.mute_modules:
             _logger = logging.getLogger(_mute_module_name)
             _logger.handlers = []
-            # _logger.propagate = False
-            # _logger.disabled = True
+            _logger.propagate = False
+            _logger.disabled = True
 
             if _mute_module_name in _intercepted_modules:
                 _intercepted_modules.remove(_mute_module_name)

beans_logging/fastapi/_middlewares.py

@@ -148,6 +148,12 @@ async def dispatch(self, request: Request, call_next) -> Response:
 
         _http_info["method"] = request.method
         _http_info["url_path"] = request.url.path
+        if "{" in _http_info["url_path"]:
+            _http_info["url_path"] = _http_info["url_path"].replace("{", "{{")
+
+        if "}" in _http_info["url_path"]:
+            _http_info["url_path"] = _http_info["url_path"].replace("}", "}}")
+
         if request.url.query:
             _http_info["url_path"] = f"{request.url.path}?{request.url.query}"
 
@@ -169,6 +175,7 @@ async def dispatch(self, request: Request, call_next) -> Response:
         ## Debug log:
         if self.use_debug_log:
             _debug_msg = self.debug_format.format(**_http_info)
+
             # _logger.debug(_debug_msg)
             await run_in_threadpool(
                 _logger.debug,
@@ -179,11 +186,11 @@ async def dispatch(self, request: Request, call_next) -> Response:
         ## Set http info to request state:
         request.state.http_info = _http_info
 
-        ## Process request:
         _start_time = time.time()
+        ## Process request:
         response = await call_next(request)
+        ## Response processed.
         _http_info["response_time"] = round((time.time() - _start_time) * 1000, 1)
-        ## Response processed
 
         if "X-Process-Time" in response.headers:
             try:

scripts/bump-version.sh

@@ -26,7 +26,6 @@ VERSION_FILE="${VERSION_FILE:-beans_logging/__version__.py}"
 
 
 _BUMP_TYPE=""
-# _BUMP_TYPE="patch"
 
 # Flags:
 _IS_PUSH_TAG=false

scripts/clean.sh

@@ -43,18 +43,20 @@ main()
 
 	find . -type f -name ".DS_Store" -print -delete || exit 2
 	find . -type f -name ".Thumbs.db" -print -delete || exit 2
+	find . -type f -name ".coverage*" -print -delete || exit 2
 	find . -type d -name "__pycache__" -exec rm -rfv {} + || exit 2
-	find ./examples -type d -name "logs" -exec rm -rfv {} + || exit 2
+	find . -type d -name ".benchmarks" -exec rm -rfv {} + || exit 2
+	find . -type d -name ".pytest_cache" -exec rm -rfv {} + || exit 2
+
+	find . -type d -name ".git" -prune -o -type d -name "logs" -exec rm -rfv {} + || exit 2
 
-	rm -rfv .benchmarks || exit 2
-	rm -rfv .pytest_cache || exit 2
 	rm -rfv build || exit 2
 	rm -rfv dist || exit 2
-	rm -rfv .coverage || exit 2
 
 	if [ "${_IS_ALL}" == true ]; then
 		rm -rfv ./*.egg-info || exit 2
 	fi
+
 	echoOk "Done."
 }