From 2829a3cb4eae430212fe4c0cefa037696a5bac0d Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 26 Jun 2025 08:18:37 +0800 Subject: [PATCH] fix --- app/db/systemconfig_oper.py | 4 ---- app/db/userconfig_oper.py | 4 ---- app/helper/thread.py | 6 +----- app/utils/singleton.py | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/db/systemconfig_oper.py b/app/db/systemconfig_oper.py index 45dca616..4fdc92b5 100644 --- a/app/db/systemconfig_oper.py +++ b/app/db/systemconfig_oper.py @@ -78,7 +78,3 @@ class SystemConfigOper(DbOper, metaclass=Singleton): if conf: conf.delete(self._db, conf.id) return True - - def __del__(self): - if self._db: - self._db.close() diff --git a/app/db/userconfig_oper.py b/app/db/userconfig_oper.py index 4b4d4b15..55b6d731 100644 --- a/app/db/userconfig_oper.py +++ b/app/db/userconfig_oper.py @@ -50,10 +50,6 @@ class UserConfigOper(DbOper, metaclass=Singleton): return self.__get_config_caches(username=username) return self.__get_config_cache(username=username, key=key) - def __del__(self): - if self._db: - self._db.close() - def __set_config_cache(self, username: str, key: str, value: Any): """ 设置配置缓存 diff --git a/app/helper/thread.py b/app/helper/thread.py index 94d9fc6e..c32a836b 100644 --- a/app/helper/thread.py +++ b/app/helper/thread.py @@ -1,8 +1,7 @@ from concurrent.futures import ThreadPoolExecutor -from typing import Optional -from app.utils.singleton import Singleton from app.core.config import settings +from app.utils.singleton import Singleton class ThreadHelper(metaclass=Singleton): @@ -28,6 +27,3 @@ class ThreadHelper(metaclass=Singleton): :return: """ self.pool.shutdown() - - def __del__(self): - self.shutdown() diff --git a/app/utils/singleton.py b/app/utils/singleton.py index 787ba3c7..3cb20076 100644 --- a/app/utils/singleton.py +++ b/app/utils/singleton.py @@ -31,7 +31,7 @@ class SingletonClass(abc.ABCMeta, type): def __call__(cls, *args, **kwargs): if cls not in cls._instances: - cls._instances[cls] = super(SingletonClass, cls).__call__(*args, **kwargs) + cls._instances[cls] = super().__call__(*args, **kwargs) return cls._instances[cls]