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

fix: Redis哨兵切换时导致core和celery组件监听线程异常退出

pull/9089/head
jiangweidong 2022-11-17 09:16:48 +08:00 committed by Jiangjie.Bai
parent a2b9a5cee3
commit 949166eaed
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/terminal/startup.py
View File

@ -3,7 +3,6 @@ import time
import socket import socket
import threading import threading
from django.conf import settings from django.conf import settings
from django.db.utils import OperationalError
from common.db.utils import close_old_connections from common.db.utils import close_old_connections
from common.decorator import Singleton from common.decorator import Singleton
@ -45,6 +44,7 @@ class BaseTerminal(object):
def start_heartbeat(self): def start_heartbeat(self):
while True: while True:
try:
heartbeat_data = { heartbeat_data = {
'cpu_load': get_cpu_load(), 'cpu_load': get_cpu_load(),
'memory_used': get_memory_usage(), 'memory_used': get_memory_usage(),
@ -56,12 +56,11 @@ class BaseTerminal(object):
status_serializer.validated_data.pop('sessions', None) status_serializer.validated_data.pop('sessions', None)
terminal = self.get_or_register_terminal() terminal = self.get_or_register_terminal()
status_serializer.validated_data['terminal'] = terminal status_serializer.validated_data['terminal'] = terminal
try:
status_serializer.save() status_serializer.save()
time.sleep(self.interval) except Exception:
except OperationalError:
close_old_connections() close_old_connections()
finally:
time.sleep(self.interval)
def get_or_register_terminal(self): def get_or_register_terminal(self):
terminal = Terminal.objects.filter( terminal = Terminal.objects.filter(