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

fix: 修复终端启动时更新remote_addr字段

pull/6821/head
Michael Bai 2021-09-13 18:01:15 +08:00 committed by Jiangjie.Bai
parent 09d51fd5be
commit 3a09845c29
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/terminal/startup.py
View File

@ -50,13 +50,21 @@ class BaseTerminal(object):
time.sleep(self.interval) time.sleep(self.interval)
def get_or_register_terminal(self): def get_or_register_terminal(self):
terminal = Terminal.objects.filter(name=self.name, type=self.type, is_deleted=False).first() terminal = Terminal.objects.filter(
name=self.name, type=self.type, is_deleted=False
).first()
if not terminal: if not terminal:
terminal = self.register_terminal() terminal = self.register_terminal()
terminal.remote_addr = self.remote_addr
terminal.save()
return terminal return terminal
def register_terminal(self): def register_terminal(self):
data = {'name': self.name, 'type': self.type, 'remote_addr': self.remote_addr} data = {
'name': self.name, 'type': self.type,
'remote_addr': self.remote_addr
}
serializer = TerminalRegistrationSerializer(data=data) serializer = TerminalRegistrationSerializer(data=data)
serializer.is_valid() serializer.is_valid()
terminal = serializer.save() terminal = serializer.save()
@ -68,7 +76,8 @@ class CoreTerminal(BaseTerminal):
def __init__(self): def __init__(self):
super().__init__( super().__init__(
suffix_name=TerminalTypeChoices.core.label, _type=TerminalTypeChoices.core.value suffix_name=TerminalTypeChoices.core.label,
_type=TerminalTypeChoices.core.value
) )
@ -76,5 +85,6 @@ class CoreTerminal(BaseTerminal):
class CeleryTerminal(BaseTerminal): class CeleryTerminal(BaseTerminal):
def __init__(self): def __init__(self):
super().__init__( super().__init__(
suffix_name=TerminalTypeChoices.celery.label, _type=TerminalTypeChoices.celery.value suffix_name=TerminalTypeChoices.celery.label,
_type=TerminalTypeChoices.celery.value
) )