github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 18:31:04 +00:00
Code Issues Projects Releases Wiki Activity

perf: es相关代码格式优化 (#8020)

Browse Source 
Co-authored-by: feng626 <1304903146@qq.com>
This commit is contained in:
fit2bot
2022-04-02 13:26:18 +08:00
committed by GitHub
parent e602bc0341
commit a936092020
2 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/terminal/backends/command/es.py
View File

@@ -18,7 +18,6 @@ from common.utils import get_logger
from common.exceptions import JMSException
from .models import AbstractSessionCommand
logger = get_logger(__file__)
@@ -27,7 +26,7 @@ class InvalidElasticsearch(JMSException):
default_detail = _('Invalid elasticsearch config')
class CommandStore():
class CommandStore(object):
def __init__(self, config):
hosts = config.get("HOSTS")
kwargs = config.get("OTHER", {})
@@ -208,7 +207,7 @@ class CommandStore():
elif org_id in (real_default_org_id, ''):
match.pop('org_id')
should.append({
'bool':{
'bool': {
'must_not': [
{
'wildcard': {'org_id': '*'}
@@ -226,20 +225,20 @@ class CommandStore():
],
'should': should,
'filter': [
{
'term': {k: v}
} for k, v in exact.items()
] + [
{
'range': {
'timestamp': timestamp_range
}
}
] + [
{
'ids': {k: v}
} for k, v in index.items()
]
{
'term': {k: v}
} for k, v in exact.items()
] + [
{
'range': {
'timestamp': timestamp_range
}
}
] + [
{
'ids': {k: v}
} for k, v in index.items()
]
}
},
}
@@ -326,8 +325,8 @@ class QuerySet(DJQuerySet):
def __getattribute__(self, item):
if any((
item.startswith('__'),
item in QuerySet.__dict__,
item.startswith('__'),
item in QuerySet.__dict__,
)):
return object.__getattribute__(self, item)