修复flask alchemy应用结束自动关闭session会出错的问题

Signed-off-by: tinybees <a598824322@163.com>

Author: tinybees

CHANGES.md

@@ -1,4 +1,9 @@
-## aeclients Changelog
+## eclients Changelog
+
+###[1.0.10] - 2021-1-14
+
+#### Changed 
+- 修复flask alchemy应用结束自动关闭session会出错的问题
 
 ###[1.0.9] - 2020-10-14
 

eclients/__init__.py

@@ -12,4 +12,4 @@
 from .db_client import *
 from .redis_client import *
 
-__version__ = "1.0.9"
+__version__ = "1.0.10"

eclients/db_client.py

@@ -6,6 +6,7 @@
 @software: PyCharm
 @time: 18-12-25 下午4:58
 """
+import threading
 from collections import MutableMapping, MutableSequence
 from contextlib import contextmanager
 from typing import Dict, List, NoReturn, Union
@@ -93,6 +94,7 @@ def __init__(self, app=None, *, username: str = "root", passwd: str = None, host
         self.dialect = dialect
         self.msg_zh = None
         self.scoped_sessions: Dict[str, scoped_session] = {}  # 主要保存其他scope session
+        self.registry = threading.local()  # 当前线程注册bind key
 
         # 这里要用重写的BaseQuery, 根据BaseQuery的规则,Model中的query_class也需要重新指定为子类model,
         # 但是从Model的初始化看,如果Model的query_class为None的话还是会设置为和Query一致，符合要求
@@ -154,8 +156,8 @@ def init_app(self, app, username: str = None, passwd: str = None, host: str = No
 
         @app.teardown_appcontext
         def shutdown_other_session(response_or_exc):
-            for _, session_ in self.scoped_sessions.items():
-                session_.remove()
+            for bind_key in getattr(self.registry, "bind_keys", set()):
+                self.scoped_sessions[bind_key].remove()
             return response_or_exc
 
     def get_engine(self, app=None, bind=None):
@@ -231,6 +233,10 @@ def gen_session(self, bind_key: str, session_options: Dict = None) -> Session:
             session = self.scoped_sessions[bind_key]()
             session.bind_key = bind_key  # 设置bind key
             session = self.ping_session(session)  # 校验重连,保证可用
+            # 加入当前线程bindkey,用于自动关闭处理
+            if hasattr(self.registry, "bind_keys") is False:
+                self.registry.bind_keys = set()
+            self.registry.bind_keys.add(bind_key)
 
         return session