shadowshell 0.0.30__tar.gz → 0.0.32__tar.gz

{shadowshell-0.0.30 → shadowshell-0.0.32}/PKG-INFO

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

{shadowshell-0.0.30 → shadowshell-0.0.32}/pyproject.toml

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

{shadowshell-0.0.30 → shadowshell-0.0.32}/src/shadowshell/__init__.py

@@ -7,8 +7,8 @@
 
 from shadowshell.logger import Logger
 from shadowshell.logger_factory import LoggerFactory
-from shadowshell.bootstrap import ShadowShell, performance_monitor, hello, shadowshell, invoke_with_tmpl, TestTemplate, testserver, cnnserver
+from shadowshell.bootstrap import ShadowShell, performance_monitor, function_monitor, hello, shadowshell, invoke_with_tmpl, TestTemplate, testserver, cnnserver
 from shadowshell.git_shell import GitShell
 from shadowshell.configurator import Configurator
 
-__all__ = ['ShadowShell', 'performance_monitor', 'hello', 'shadowshell', 'Configurator', 'invoke_with_tmpl', 'TestTemplate', 'Logger', 'LoggerFactory', 'GitShell', 'testserver', 'cnnserver']
+__all__ = ['ShadowShell', 'performance_monitor', 'function_monitor', 'hello', 'shadowshell', 'Configurator', 'invoke_with_tmpl', 'TestTemplate', 'Logger', 'LoggerFactory', 'GitShell', 'testserver', 'cnnserver']

{shadowshell-0.0.30 → shadowshell-0.0.32}/src/shadowshell/bootstrap.py

@@ -9,15 +9,6 @@ import time
 
 logger = LoggerFactory().get_logger()
 
-def performance_monitor(func):
-    def wrapper(*args, **kwargs):
-        start = time.perf_counter()
-        result = func(*args, **kwargs)
-        elapsed = time.perf_counter() - start
-        logger.info(f"[{func.__name__}] has ran, time elapsed:{elapsed:.6f} s.")
-        return result
-    return wrapper
-
 """
 ShadowShell
 
@@ -81,6 +72,29 @@ 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(func):
+    def wrapper(*args, **kwargs):
+        start = time.perf_counter()
+        try:
+            result = func(*args, **kwargs)    
+        except Exception as e:
+            logger.error(e)
+        except:
+            logger.error(sys.exc_info()[0])
+        finally:
+            elapsed = time.perf_counter() - start
+            logger.info(f"[FUNCTION_MONITOR][{func.__name__}] has ran, time elapsed:{elapsed:.6f} s.")
+            return result
+    return wrapper
 
 def testserver():
     os.system("ping shadowshell.xyz")

{shadowshell-0.0.30 → shadowshell-0.0.32}/src/shadowshell.egg-info/PKG-INFO

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