github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修改判断会话活跃逻辑；不必要判断协议 (#5262) 

* fix: 修改判断会话活跃逻辑；不必要判断协议

* fix: 修改导入task问题

Co-authored-by: Bai <bugatti_it@163.com>
pull/5265/head
fit2bot 2020-12-15 18:06:35 +08:00 committed by GitHub
parent b57453cc3c
commit a36e6fbf84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/terminal/models/session.py
View File

@ -132,7 +132,7 @@ class Session(OrgModelMixin):
return None, e return None, e
if settings.SERVER_REPLAY_STORAGE: 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)) upload_session_replay_to_external_storage.delay(str(self.id))
return name, None return name, None
@ -146,10 +146,8 @@ class Session(OrgModelMixin):
return cls.objects.filter(is_finished=False) return cls.objects.filter(is_finished=False)
def is_active(self): def is_active(self):
if self.protocol in ['ssh', 'telnet', 'rdp', 'mysql']:
key = self.ACTIVE_CACHE_KEY_PREFIX.format(self.id) key = self.ACTIVE_CACHE_KEY_PREFIX.format(self.id)
return bool(cache.get(key)) return bool(cache.get(key))
return True
@property @property
def command_amount(self): def command_amount(self):