shadowshell 0.0.40__tar.gz → 0.0.74__tar.gz

{shadowshell-0.0.40 → shadowshell-0.0.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowshell
-Version: 0.0.40
+Version: 0.0.74
 Summary: www.shadowshell.xyz
 Author-email: shadowshell <shadowshellxyz@foxmail.com>
 License: MIT

{shadowshell-0.0.40 → shadowshell-0.0.74}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shadowshell"   # 全局唯一名称（检查PyPI是否被占用）
-version = "0.0.40"          # 版本号（每次更新需递增）
-#version = "0.0.71"          # 版本号（每次更新需递增）
+#version = "0.0.41"          # 版本号（每次更新需递增）
+version = "0.0.74"          # 版本号（每次更新需递增）
 authors = [{ name = "shadowshell", email = "shadowshellxyz@foxmail.com" }]
 description = "www.shadowshell.xyz"
 readme = "README.md"

{shadowshell-0.0.40 → shadowshell-0.0.74}/src/shadowshell/config/configurator.py

@@ -8,24 +8,23 @@ Configurator
 
 import configparser
 
-from shadowshell import LoggerFactory
+from shadowshell.logging import LoggerFactory
+from shadowshell.monitor import function_monitor
+
+class_name = "Configurator"
 
 class Configurator:
 
     config = None;
 
+    @function_monitor(class_name)
     def __init__(self, config_file):
-
-        self.logger = LoggerFactory().get_logger()
-
-        # 加载配置文件
         self.config = configparser.ConfigParser()
         self.config.read(config_file)
-        self.logger.debug("load and read config file : %s." % (config_file))
         
+    @function_monitor(class_name)
     def get(self, group, key):
         value = self.config.get(group, key)
-        self.logger.debug("group -> %s, key -> %s, value -> %s" % (group, key, value))
         return value
 
 

{shadowshell-0.0.40 → shadowshell-0.0.74}/src/shadowshell/configurator.py

@@ -16,7 +16,7 @@ class Configurator:
 
     def __init__(self, config_file):
 
-        self.logger = LoggerFactory().get_logger()
+        self.logger = LoggerFactory.get_logger()
 
         # 加载配置文件
         self.config = configparser.ConfigParser()

{shadowshell-0.0.40 → shadowshell-0.0.74}/src/shadowshell/logger_factory.py

@@ -10,14 +10,15 @@ from shadowshell.console_logger import ConsoleLogger
 
 class LoggerFactory:
         
-    logger = None
+    __logger = logger = ConsoleLogger()
 
     def __init__(self):
-        self.logger = ConsoleLogger()
+        pass
 
-    def get_logger(self, name = "default"):
-        return self.logger
+    @staticmethod
+    def get_logger(name = "default"):
+        return LoggerFactory.__logger
 
 if __name__ == "__main__":
-    LoggerFactory().get_logger().info("test")
+    LoggerFactory.get_logger().info("test")
     

shadowshell-0.0.74/src/shadowshell/monitor/monitor.py

@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+@author: shadowshell
+"""
+
+import sys
+import time
+from shadowshell.logging import LoggerFactory
+from shadowshell.serialize import SerializerFactory
+def __callback(request, response):
+    logger = LoggerFactory.get_logger()  
+    logger.info(f"[CALLBACK][Request]{__format_request(request)}[Response]{__format_response(response)}")
+
+def performance_monitor(class_name = None):
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            start = time.perf_counter()
+            response = None
+            is_successed = True
+            try:
+                response = func(*args, **kwargs)
+            except:
+                LoggerFactory.get_logger().error(sys.exc_info()[0])
+                is_successed = False
+                raise
+            finally:
+                cost = time.perf_counter() - start
+                # log
+                __record_digest_log("PERFORMANCE_MONITOR", class_name, func.__name__, cost, is_successed)
+                return response
+        return wrapper
+    return decorator
+
+def function_monitor(class_name = None, callback = __callback):
+    logger = LoggerFactory.get_logger()
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            start = time.perf_counter()
+            response = None
+            is_successed = True
+            try:
+                response = func(*args, **kwargs)    
+            except Exception as e:
+                logger.error(e)
+                is_successed = False
+                raise
+            except:
+                logger.error(sys.exc_info()[0])
+                is_successed = False
+                raise
+            finally:
+                cost = time.perf_counter() - start
+                # log
+                __record_digest_log("FUNCTION_MONITOR", class_name, func.__name__, cost, is_successed)
+                __record_detail_log("FUNCTION_MONITOR", class_name, func.__name__, args, response)
+                 # callback
+                if callback is not None:
+                    try:
+                        callback(args, response)
+                    finally:
+                        logger.error(sys.exc_info()[0])  
+                        
+                return response
+        return wrapper
+    return decorator
+
+def __get_service_name(class_name, func_name):
+    service_name = func_name
+    if (class_name is not None):
+        service_name = class_name + "." + func_name
+    return service_name
+
+def __format_request(request):
+   return SerializerFactory.get_instance().serialize(request)
+
+def __format_response(response):
+   return SerializerFactory.get_instance().serialize(response)
+def __record_digest_log(monitor_name, class_name, func_name, cost, is_successed):
+    logger = LoggerFactory.get_logger()
+    logger.info(f"[{monitor_name}][DIGEST_LOG][{__get_service_name(class_name, func_name)}]successed={is_successed}, cost:{cost:.6f}s.")
+
+def __record_detail_log(monitor_name, class_name, func_name, request, response):
+    logger = LoggerFactory.get_logger()
+    logger.info(f"[{monitor_name}][DETAIL_LOG][{__get_service_name(class_name, func_name)}][Request]{__format_request(request)}[Response]{__format_response(response)}")

{shadowshell-0.0.40 → shadowshell-0.0.74}/src/shadowshell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowshell
-Version: 0.0.40
+Version: 0.0.74
 Summary: www.shadowshell.xyz
 Author-email: shadowshell <shadowshellxyz@foxmail.com>
 License: MIT

shadowshell-0.0.40/src/shadowshell/monitor/monitor.py

@@ -1,64 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-@author: shadowshell
-"""
-
-import sys
-import time
-from shadowshell.logging import LoggerFactory
-
-logger = LoggerFactory().get_logger()
-
-def performance_monitor(class_name=None):
-    def decorator(func):
-        def wrapper(*args, **kwargs):
-            start = time.perf_counter()
-            result = None
-            try:
-                result = func(*args, **kwargs)
-            finally:
-                elapsed = time.perf_counter() - start
-                if (class_name is not None):
-                    logger.info(f"[PERFORMANCE_MONITOR][{class_name}.{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")
-                else:
-                    logger.info(f"[PERFORMANCE_MONITOR][{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")
-                return result
-        return wrapper
-    return decorator
-
-def function_monitor(class_name=None, callback=None):
-    def decorator(func):
-        def wrapper(*args, **kwargs):
-            start = time.perf_counter()
-            result = None
-            is_success = True
-            try:
-                result = func(*args, **kwargs)    
-            except Exception as e:
-                logger.error(e)
-                is_success = False
-                raise
-            except:
-                logger.error(sys.exc_info()[0])
-                is_success = False
-                raise
-            finally:
-                elapsed = time.perf_counter() - start
-                # log
-                if (class_name is not None):
-                    logger.info(f"[FUNCTION_MONITOR][{class_name}.{func.__name__}] has ran, is_success={is_success}, time elapsed:{elapsed:.6f}s.")            
-                else:
-                    logger.info(f"[FUNCTION_MONITOR][{func.__name__}] has ran, is_success={is_success}, time elapsed:{elapsed:.6f}s.")
-                
-                 # callback
-                if callback is not None:
-                    try:
-                        callback(args, kwargs, result, f"{elapsed:.6f}")
-                    finally:
-                        logger.error(sys.exc_info()[0])  
-                        
-                return result
-        return wrapper
-    return decorator