Compare commits

...

29 Commits

Author SHA1 Message Date
Bai
38115970aa perf: stay release top 2024-11-01 13:58:40 +08:00
ibuler
3153458fce fix: oracle platform create error 2024-10-30 16:33:42 +08:00
feng
4b981fd93c fix: Error subpub_msg log 2024-10-17 15:17:12 +08:00
Bryan
6720ecc6e0 Merge pull request #14319 from jumpserver/dev
v4.3.0
2024-10-17 14:55:38 +08:00
老广
0b3a7bb020 Merge pull request #14203 from jumpserver/dev
merge: from dev to master
2024-09-19 19:37:19 +08:00
Bryan
56373e362b Merge pull request #13988 from jumpserver/dev
v4.1.0
2024-08-16 18:40:35 +08:00
Bryan
02fc045370 Merge pull request #13600 from jumpserver/dev
v4.0.0
2024-07-03 19:04:35 +08:00
Bryan
e4ac73896f Merge pull request #13452 from jumpserver/dev
v3.10.11-lts
2024-06-19 16:01:26 +08:00
Bryan
1518f792d6 Merge pull request #13236 from jumpserver/dev
v3.10.10-lts
2024-05-16 16:04:07 +08:00
Bai
67277dd622 fix: 修复仪表盘会话排序数量都是 1 的问题 2024-04-22 19:42:33 +08:00
Bryan
82e7f020ea Merge pull request #13094 from jumpserver/dev
v3.10.9 (dev to master)
2024-04-22 19:39:53 +08:00
Bryan
f20b9e01ab Merge pull request #13062 from jumpserver/dev
v3.10.8 dev to master
2024-04-18 18:01:20 +08:00
Bryan
8cf8a3701b Merge pull request #13059 from jumpserver/dev
v3.10.8
2024-04-18 17:16:37 +08:00
Bryan
7ba24293d1 Merge pull request #12736 from jumpserver/pr@dev@master_fix
fix: 解决冲突
2024-02-29 16:38:43 +08:00
Bai
f10114c9ed fix: 解决冲突 2024-02-29 16:37:10 +08:00
Bryan
cf31cbfb07 Merge pull request #12729 from jumpserver/dev
v3.10.4
2024-02-29 16:19:59 +08:00
wangruidong
0edad24d5d fix: 资产过期消息提示发送失败 2024-02-04 11:41:48 +08:00
ibuler
1f1c1a9157 fix: 修复定时检测用户是否活跃任务无法执行的问题 2024-01-23 09:28:38 +00:00
feng
6c9d271ae1 fix: redis 密码有特殊字符celery beat启动失败 2024-01-22 06:18:34 +00:00
Bai
6ff852e225 perf: 修复 Count 时没有去重的问题 2024-01-22 06:16:25 +00:00
Bryan
baa75dc735 Merge pull request #12566 from jumpserver/master
v3.10.2
2024-01-17 07:34:28 -04:00
Bryan
8a9f0436b8 Merge pull request #12565 from jumpserver/dev
v3.10.2
2024-01-17 07:23:30 -04:00
Bryan
a9620a3cbe Merge pull request #12461 from jumpserver/master
v3.10.1
2023-12-29 11:33:05 +05:00
Bryan
769e7dc8a0 Merge pull request #12460 from jumpserver/dev
v3.10.1
2023-12-29 11:20:36 +05:00
Bryan
2a70449411 Merge pull request #12458 from jumpserver/dev
v3.10.1
2023-12-29 11:01:13 +05:00
Bryan
8df720f19e Merge pull request #12401 from jumpserver/dev
v3.10
2023-12-21 15:14:19 +05:00
老广
dabbb45f6e Merge pull request #12144 from jumpserver/dev
v3.9.0
2023-11-16 18:23:05 +08:00
Bryan
ce24c1c3fd Merge pull request #11914 from jumpserver/dev
v3.8.0
2023-10-19 03:37:39 -05:00
Bryan
3c54c82ce9 Merge pull request #11636 from jumpserver/dev
v3.7.0
2023-09-21 17:02:48 +08:00
3 changed files with 9 additions and 7 deletions

View File

@@ -3,6 +3,7 @@ from collections import defaultdict
from copy import deepcopy from copy import deepcopy
from django.conf import settings from django.conf import settings
from django.utils.functional import lazy
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from common.db.models import ChoicesMixin from common.db.models import ChoicesMixin
@@ -29,15 +30,15 @@ class AllTypes(ChoicesMixin):
@classmethod @classmethod
def choices(cls): def choices(cls):
return lazy(cls.get_choices, list)()
@classmethod
def get_choices(cls):
choices = [] choices = []
for tp in cls.includes: for tp in cls.includes:
choices.extend(tp.get_choices()) choices.extend(tp.get_choices())
return choices return choices
@classmethod
def get_choices(cls):
return cls.choices()
@classmethod @classmethod
def filter_choices(cls, category): def filter_choices(cls, category):
choices = dict(cls.category_types()).get(category, cls).get_choices() choices = dict(cls.category_types()).get(category, cls).get_choices()

View File

@@ -47,7 +47,7 @@ class Subscription:
self.ch = pb.ch self.ch = pb.ch
self.sub = sub self.sub = sub
self.unsubscribed = False self.unsubscribed = False
logger.info("Subscribed to channel: ", sub) logger.info(f"Subscribed to channel: {sub}")
def _handle_msg(self, _next, error, complete): def _handle_msg(self, _next, error, complete):
""" """
@@ -106,11 +106,11 @@ class Subscription:
def unsubscribe(self): def unsubscribe(self):
self.unsubscribed = True self.unsubscribed = True
logger.info("Unsubscribed from channel: ", self.sub) logger.info(f"Unsubscribed from channel: {self.sub}")
try: try:
self.sub.close() self.sub.close()
except Exception as e: except Exception as e:
logger.warning('Unsubscribe msg error: {}'.format(e)) logger.warning(f'Unsubscribe msg error: {e}')
def retry(self, _next, error, complete): def retry(self, _next, error, complete):
logger.info('Retry subscribe channel: {}'.format(self.ch)) logger.info('Retry subscribe channel: {}'.format(self.ch))

View File

@@ -28,6 +28,7 @@ from terminal.models import Session, Command
from terminal.utils import ComponentsPrometheusMetricsUtil from terminal.utils import ComponentsPrometheusMetricsUtil
from users.models import User from users.models import User
__all__ = ['IndexApi'] __all__ = ['IndexApi']