shadowshell 0.0.34__tar.gz → 0.0.36__tar.gz

{shadowshell-0.0.34 → shadowshell-0.0.36}/PKG-INFO

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

{shadowshell-0.0.34 → shadowshell-0.0.36}/pyproject.toml

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

{shadowshell-0.0.34 → shadowshell-0.0.36}/src/shadowshell/bootstrap.py

@@ -72,19 +72,28 @@ class TestTemplate:
         self.logger.debug('Nothing')
         return
 
-def performance_monitor(func):
-    def wrapper(*args, **kwargs):
-        start = time.perf_counter()
-        result = func(*args, **kwargs)
-        elapsed = time.perf_counter() - start
-        logger.info(f"[PERFORMANCE_MONITOR][{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")
-        return result
-    return wrapper
-
-def function_monitor(clazz=None):
+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):
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            start = time.perf_counter()
+            result = None
             try:
                 result = func(*args, **kwargs)    
             except Exception as e:
@@ -93,8 +102,8 @@ def function_monitor(clazz=None):
                 logger.error(sys.exc_info()[0])
             finally:
                 elapsed = time.perf_counter() - start
-                if (clazz is not None):
-                    logger.info(f"[FUNCTION_MONITOR][{clazz.__name__}][{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")            
+                if (class_name is not None):
+                    logger.info(f"[FUNCTION_MONITOR][{class_name}][{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")            
                 else:
                     logger.info(f"[FUNCTION_MONITOR][{func.__name__}] has ran, time elapsed:{elapsed:.6f}s.")
                 return result

{shadowshell-0.0.34 → shadowshell-0.0.36}/src/shadowshell.egg-info/PKG-INFO

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