github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-08-09 08:03:53 +00:00
Code Issues Projects Releases Wiki Activity

fix: manage database connections in LDAP worker threads

Browse Source
This commit is contained in:
Crane.z
2026-08-05 14:41:21 +08:00
parent bf0a42f2c6
commit ebf77b779d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/db/utils.py
View File

@@ -60,8 +60,10 @@ def close_old_connections(**kwargs):
@contextmanager
def safe_db_connection():
close_old_connections()
yield
close_old_connections()
try:
yield
finally:
close_old_connections()
@contextmanager

7
apps/settings/ws.py
View File

@@ -11,7 +11,7 @@ from django.core.cache import cache
from django.utils import translation
from django.utils.translation import gettext_lazy as _
from common.db.utils import close_old_connections
from common.db.utils import close_old_connections, safe_db_connection
from common.utils import get_logger
from orgs.mixins.ws import OrgMixin
from orgs.models import Organization
@@ -148,8 +148,9 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer, OrgMixin):
await self.send_msg(msg='Exception: %s' % error)
def run_func(self, func_name, data):
with translation.override(getattr(self.scope['user'], 'lang') or settings.LANGUAGE_CODE):
return getattr(self, func_name)(data)
with safe_db_connection():
with translation.override(getattr(self.scope['user'], 'lang') or settings.LANGUAGE_CODE):
return getattr(self, func_name)(data)
async def send_msg(self, ok=True, msg=''):
await self.send_json({'ok': ok, 'msg': f'{msg}'})