github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-09 02:57:55 +00:00
Code Issues Projects Releases Wiki Activity

perf: 处理冲突

Browse Source
This commit is contained in:
jiangweidong
2023-02-07 08:55:57 +08:00
parent 90fdaca955 1dd915cefd
commit 49c78f65a6
135 changed files with 2732 additions and 3395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/audits/handler.py
View File

@@ -131,7 +131,7 @@ class OperatorLogHandler(metaclass=Singleton):
return before, after
def create_or_update_operate_log(
self, action, resource_type, resource=None,
self, action, resource_type, resource=None, resource_display=None,
force=False, log_id=None, before=None, after=None,
object_name=None
):
@@ -140,7 +140,9 @@ class OperatorLogHandler(metaclass=Singleton):
return
remote_addr = get_request_ip(current_request)
resource_display = self.get_resource_display(resource)
if resource_display is None:
resource_display = self.get_resource_display(resource)
resource_id = getattr(resource, 'pk', '')
before, after = self.data_processing(before, after)
if not force and not any([before, after]):
# 前后都没变化，没必要生成日志，除非手动强制保存
@@ -148,9 +150,10 @@ class OperatorLogHandler(metaclass=Singleton):
data = {
'id': log_id, "user": str(user), 'action': action,
'resource_type': str(resource_type), 'resource': resource_display,
'resource_type': str(resource_type),
'resource_id': resource_id, 'resource': resource_display,
'remote_addr': remote_addr, 'before': before, 'after': after,
'org_id': get_current_org_id(), 'resource_id': str(resource.id)
'org_id': get_current_org_id(),
}
with transaction.atomic():
if self.log_client.ping(timeout=1):