lesscode-py 0.3.135__tar.gz → 0.3.136__tar.gz

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/PKG-INFO

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

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/lesscode/utils/CacheUtil.py

@@ -16,6 +16,23 @@ from threading import Thread
 
 # 装饰器
 
+def common_cache(func, ex, *args, **params):
+    try:
+        data = deal_cache(func, ex, None, *args, **params)
+    except Exception as e:
+        logging.error(traceback.format_exc())
+        data = func(*args, **params)
+    return data
+
+
+async def async_common_cache(func, ex, *args, **params):
+    try:
+        data = deal_cache(func, ex, None, *args, **params)
+    except Exception as e:
+        logging.error(traceback.format_exc())
+        data = await func(*args, **params)
+    return data
+
 
 def Cache(ex=3600 * 12, cache_key=None):
     def cache_func(func):
@@ -64,6 +81,24 @@ def query_cache(cache_key, params=None, ex=3600 * 12, func=None, args=None, conn
     if options.cache_enable:
         ttl = RedisHelper(conn_name).get_connection(sync=True).ttl(cache_key)
 
+        if ttl and ex >= 900 and 0 < ttl <= ex - 900:
+            Thread(target=request_interface, kwargs={
+                "func": func,
+                "params": params,
+                "args": args,
+                "ex": ex,
+                "cache_key": cache_key
+            }).start()
+        data = RedisHelper(conn_name).sync_get(cache_key)
+        if data:
+            value = json.loads(data)
+            return value
+        else:
+            logging.info("str_select_key为".format(cache_key))
+            return False
+    if options.common_cache_enable:
+        ttl = RedisHelper(conn_name).get_connection(sync=True).ttl(cache_key)
+
         if ttl and ex >= 900 and 0 < ttl <= ex - 900:
             Thread(target=request_interface, kwargs={
                 "func": func,
@@ -117,3 +152,8 @@ def insert_cache(data, ex, cache_key, conn_name=None):
                 RedisHelper(conn_name).sync_set(cache_key, JSONEncoder().encode(data), ex=ex)
             except:
                 logging.error(traceback.format_exc())
+        if options.common_cache_enable:
+            try:
+                RedisHelper(conn_name).sync_set(cache_key, JSONEncoder().encode(data), ex=ex)
+            except:
+                logging.error(traceback.format_exc())

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.3.135"
+__version__ = "0.3.136"

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/lesscode/web/base_handler.py

@@ -20,6 +20,7 @@ from tornado.options import options
 from tornado.web import RequestHandler, Application
 
 from lesscode.task.task_helper import TaskHelper
+from lesscode.utils.CacheUtil import async_common_cache, common_cache
 from lesscode.utils.es_log.record_log import es_record_log
 from lesscode.utils.json import JSONEncoder
 from lesscode.web.business_exception import BusinessException
@@ -257,11 +258,18 @@ class BaseHandler(RequestHandler):
             try:
                 if inspect.iscoroutinefunction(handler_method):
                     # data = await handler_method(*params_list)
-                    data = await handler_method(**params_dict)
+                    if options.common_cache_enable:
+                        data = await async_common_cache(handler_method, options.common_cache_ex, **params_dict)
+                    else:
+                        data = await handler_method(**params_dict)
+
                 else:
                     # 阻塞方法异步调用
                     # data = await IOLoop.current().run_in_executor(None, handler_method, *params_list)
-                    func = lambda: handler_method(**params_dict)
+                    if options.common_cache_enable:
+                        func = lambda: common_cache(handler_method, options.common_cache_ex, **params_dict)
+                    else:
+                        func = lambda: handler_method(**params_dict)
                     data = await IOLoop.current().run_in_executor(None, func)
                 self.end_time = int(round(time.time() * 1000))
                 self.set_header("Api-Time", f"{self.end_time - self.start_time}ms")

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/lesscode/web/web_server.py

@@ -53,6 +53,8 @@ define("kafka_config", default={}, type=dict, help="kafka配置")
 define("log_es_config", default={}, type=dict, help="同步日志到es的配置")
 define("cache_conn", default="redis_con_1", type=str, help="redis缓存连接")
 define("cache_enable", default=False, type=bool, help="redis缓存开关")
+define("common_cache_enable", default=False, type=bool, help="redis缓存开关")
+define("common_cache_ex", default=3600 * 12, type=int, help="redis缓存时间，单位秒")
 define("task_list", default=[], type=list, help="任务列表")
 define("correction_param", default={"enable": False}, type=dict, help="aes加密key")
 define("sentry_config", default={"enable": False}, type=dict, help="sentry配置")

{lesscode-py-0.3.135 → lesscode-py-0.3.136}/lesscode_py.egg-info/PKG-INFO

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