xbase-util 0.2.7__tar.gz → 0.2.9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {xbase_util-0.2.7 → xbase_util-0.2.9}/PKG-INFO +1 -1
- {xbase_util-0.2.7 → xbase_util-0.2.9}/setup.py +1 -1
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/es_db_util.py +4 -4
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util.egg-info/PKG-INFO +1 -1
- {xbase_util-0.2.7 → xbase_util-0.2.9}/README.md +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/setup.cfg +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/__init__.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/__init__.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/bean/ConfigBean.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/bean/CurrentConfigBean.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/bean/FlowBean.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/bean/TaskTemplateBean.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/bean/__init__.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/dao/ConfigDao.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/dao/CurrentConfigDao.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/dao/FlowDao.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/dao/TaskTemplateDao.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/dao/__init__.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/db/initsqlite3.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/esreq.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/geo_util.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/handle_features_util.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/pcap_util.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/xbase_constant.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util/xbase_util.py +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util.egg-info/SOURCES.txt +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util.egg-info/dependency_links.txt +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util.egg-info/not-zip-safe +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util.egg-info/top_level.txt +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util_assets/GeoLite2-City.mmdb +0 -0
- {xbase_util-0.2.7 → xbase_util-0.2.9}/xbase_util_assets/arkimeparse.js +0 -0
|
@@ -2,9 +2,9 @@ import os.path
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
class EsDb:
|
|
5
|
-
def __init__(self, req):
|
|
5
|
+
def __init__(self, req, manager):
|
|
6
6
|
self.req = req
|
|
7
|
-
self.internals =
|
|
7
|
+
self.internals = manager.dict()
|
|
8
8
|
print("初始化:Elasticsearch DB")
|
|
9
9
|
|
|
10
10
|
def get_file_by_file_id(self, node, num, prefix=None):
|
|
@@ -15,7 +15,6 @@ class EsDb:
|
|
|
15
15
|
try:
|
|
16
16
|
hits = res.json()['hits']['hits']
|
|
17
17
|
if len(hits) > 0:
|
|
18
|
-
self.internals[key] = hits[0]['_source']
|
|
19
18
|
file = hits[0]['_source']
|
|
20
19
|
if prefix is None:
|
|
21
20
|
return file
|
|
@@ -26,7 +25,8 @@ class EsDb:
|
|
|
26
25
|
basename = os.path.basename(origin_path)
|
|
27
26
|
result_path = f"{prefix_res}{basename}"
|
|
28
27
|
file['name'] = result_path
|
|
28
|
+
self.internals[key] = file
|
|
29
29
|
return file
|
|
30
30
|
except Exception as e:
|
|
31
|
-
print(f"获取es文件失败：{res.text}获取es文件失败")
|
|
31
|
+
print(f"获取es文件失败：{node}-{num}\n\n{res.text}获取es文件失败")
|
|
32
32
|
return None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|