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

perf: operate log amount (#9695) 

Co-authored-by: feng <1304903146@qq.com>
pull/9698/head
fit2bot 2023-02-22 19:42:40 +08:00 committed by GitHub
parent ddcd09c6a6
commit ec4cdc801f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/audits/api.py
View File

@ -147,8 +147,7 @@ class OperateLogViewSet(OrgReadonlyModelViewSet):
return super().get_serializer_class() return super().get_serializer_class()
def get_queryset(self): def get_queryset(self):
with tmp_to_root_org(): qs = OperateLog.objects.all()
qs = OperateLog.objects.all()
es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG
if es_config: if es_config:
engine_mod = import_module(TYPE_ENGINE_MAPPING['es']) engine_mod = import_module(TYPE_ENGINE_MAPPING['es'])

4
apps/jumpserver/api.py
View File

@ -101,9 +101,9 @@ class DateTimeMixin:
@lazyproperty @lazyproperty
def operate_logs_queryset(self): def operate_logs_queryset(self):
from audits.api import OperateLogViewSet
t = self.days_to_datetime t = self.days_to_datetime
queryset = OperateLog.objects.filter(datetime__gte=t) queryset = OperateLogViewSet().get_queryset().filter(datetime__gte=t)
queryset = self.get_logs_queryset(queryset, 'user')
return queryset return queryset
@lazyproperty @lazyproperty