From a36e6fbf84c68feca3519729e5e9876d8c080954 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 15 Dec 2020 18:06:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=B4=BB=E8=B7=83=E9=80=BB=E8=BE=91=EF=BC=9B?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E5=88=A4=E6=96=AD=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=20(#5262)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 修改判断会话活跃逻辑；不必要判断协议 * fix: 修改导入task问题 Co-authored-by: Bai --- apps/terminal/models/session.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/terminal/models/session.py b/apps/terminal/models/session.py index 4e2a1b99a..b35a618bc 100644 --- a/apps/terminal/models/session.py +++ b/apps/terminal/models/session.py @@ -132,7 +132,7 @@ class Session(OrgModelMixin): return None, e if settings.SERVER_REPLAY_STORAGE: - from .tasks import upload_session_replay_to_external_storage + from ..tasks import upload_session_replay_to_external_storage upload_session_replay_to_external_storage.delay(str(self.id)) return name, None @@ -146,10 +146,8 @@ class Session(OrgModelMixin): return cls.objects.filter(is_finished=False) def is_active(self): - if self.protocol in ['ssh', 'telnet', 'rdp', 'mysql']: - key = self.ACTIVE_CACHE_KEY_PREFIX.format(self.id) - return bool(cache.get(key)) - return True + key = self.ACTIVE_CACHE_KEY_PREFIX.format(self.id) + return bool(cache.get(key)) @property def command_amount(self):