lesscode-flask 0.2.111__tar.gz → 0.2.113__tar.gz

{lesscode_flask-0.2.111 → lesscode_flask-0.2.113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.111
+Version: 0.2.113
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.111 → lesscode_flask-0.2.113}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.111"
+__version__ = "0.2.113"
 
 import functools
 import logging

{lesscode_flask-0.2.111 → lesscode_flask-0.2.113}/lesscode_flask/db/executor.py

@@ -1,3 +1,4 @@
+import logging
 import time
 
 
@@ -34,26 +35,36 @@ class QueryExecutor:
 
     def run(self):
         started_at = time.time()
-        #
-        # logger.debug("Executing query:\n%s", self.query)
         self._log_progress("executing_query")
-
         annotated_query = self._annotate_query(self.query_runner)
-
-        data, error = self.query_runner.run_query(annotated_query, self.user)
-        if error:
-            raise QueryExecutionError(error)
-        return data
+        try:
+            data, error = self.query_runner.run_query(annotated_query, self.user)
+            run_time = time.time() - started_at
+            logging.info(f"query finished in {run_time:.3f}s sql:\n{annotated_query}")
+            if error:
+                raise QueryExecutionError(error)
+            return data
+        except Exception as e:
+            run_time = time.time() - started_at
+            logging.error(f"query failed in {run_time:.3f}s sql:\n{annotated_query}")
+            raise e
 
     def exec(self):
+        started_at = time.time()
         self._log_progress("executing_query")
 
         annotated_query = self._annotate_query(self.query_runner)
-
-        data, error = self.query_runner.exec(annotated_query, self.user)
-        if error:
-            raise QueryExecutionError(error)
-        return data
+        try:
+            data, error = self.query_runner.exec(annotated_query, self.user)
+            run_time = time.time() - started_at
+            logging.info(f"query finished in {run_time:.3f}s sql:\n{annotated_query}")
+            if error:
+                raise QueryExecutionError(error)
+            return data
+        except Exception as e:
+            run_time = time.time() - started_at
+            logging.error(f"query failed in {run_time:.3f}s sql:\n{annotated_query}")
+            raise e
 
         #
         # logger.info(

{lesscode_flask-0.2.111 → lesscode_flask-0.2.113}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.111
+Version: 0.2.113
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy