Compare commits

...

21 Commits

Author SHA1 Message Date
wangruidong
23874460da fix: 控制台-仪表盘会话用户,资产排名不对 2024-04-19 17:16:01 +08:00
Bai
913c0d140d fix: 修复 Celery Execution 任务保存失败导致 View 事务回滚的问题(首次登录用户修改密码失败) 2024-04-18 21:20:19 +08:00
Bryan
60d9db7707 Merge pull request #13063 from jumpserver/master
v3.10.8 master to v3.10
2024-04-18 18:05:30 +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

View File

@@ -134,9 +134,10 @@ def task_sent_handler(headers=None, body=None, **kwargs):
args, kwargs, __ = body args, kwargs, __ = body
try: try:
args = list(args) args = json.loads(json.dumps(list(args), cls=JSONEncoder))
kwargs = json.loads(json.dumps(kwargs, cls=JSONEncoder)) kwargs = json.loads(json.dumps(kwargs, cls=JSONEncoder))
except Exception as e: except Exception as e:
logger.error('Parse task args or kwargs error (Need handle): {}'.format(e))
args = [] args = []
kwargs = {} kwargs = {}
@@ -151,10 +152,12 @@ def task_sent_handler(headers=None, body=None, **kwargs):
request = get_current_request() request = get_current_request()
if request and request.user.is_authenticated: if request and request.user.is_authenticated:
data['creator'] = request.user data['creator'] = request.user
with transaction.atomic():
try: try:
CeleryTaskExecution.objects.create(**data) CeleryTaskExecution.objects.create(**data)
except Exception as e: except Exception as e:
logger.error(e) logger.error('Create celery task execution error: {}'.format(e))
CeleryTask.objects.filter(name=task).update(date_last_publish=timezone.now()) CeleryTask.objects.filter(name=task).update(date_last_publish=timezone.now())