From 3a09845c29e7ba5bb9699de61f0e574aeaab3624 Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Mon, 13 Sep 2021 18:01:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E6=9B=B4=E6=96=B0remote=5Faddr?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/startup.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/terminal/startup.py b/apps/terminal/startup.py index 0626911ef..f2d8d64e7 100644 --- a/apps/terminal/startup.py +++ b/apps/terminal/startup.py @@ -50,13 +50,21 @@ class BaseTerminal(object): time.sleep(self.interval) 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: terminal = self.register_terminal() + + terminal.remote_addr = self.remote_addr + terminal.save() return terminal 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.is_valid() terminal = serializer.save() @@ -68,7 +76,8 @@ class CoreTerminal(BaseTerminal): def __init__(self): 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): def __init__(self): super().__init__( - suffix_name=TerminalTypeChoices.celery.label, _type=TerminalTypeChoices.celery.value + suffix_name=TerminalTypeChoices.celery.label, + _type=TerminalTypeChoices.celery.value )