Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
682f6b2f
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
682f6b2f
编写于
4月 12, 2021
作者:
X
xinwen
提交者:
baltery
4月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 资产节点关系变化时也要清空 root 组织的 node_assets_mapping
上级
a2e39799
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
11 deletion
+32
-11
apps/assets/models/node.py
apps/assets/models/node.py
+9
-0
apps/assets/signals_handler/node_assets_mapping.py
apps/assets/signals_handler/node_assets_mapping.py
+23
-11
未找到文件。
apps/assets/models/node.py
浏览文件 @
682f6b2f
...
...
@@ -307,6 +307,15 @@ class NodeAllAssetsMappingMixin:
org_id
=
str
(
org_id
)
cls
.
orgid_nodekey_assetsid_mapping
.
pop
(
org_id
,
None
)
@
classmethod
def
expire_all_orgs_node_all_asset_ids_mapping_from_memory
(
cls
):
orgs
=
Organization
.
objects
.
all
()
org_ids
=
[
str
(
org
.
id
)
for
org
in
orgs
]
org_ids
.
append
(
Organization
.
ROOT_ID
)
for
id
in
org_ids
:
cls
.
expire_node_all_asset_ids_mapping_from_memory
(
id
)
# get order: from memory -> (from cache -> to generate)
@
classmethod
def
get_node_all_asset_ids_mapping_from_cache_or_generate_to_cache
(
cls
,
org_id
):
...
...
apps/assets/signals_handler/node_assets_mapping.py
浏览文件 @
682f6b2f
...
...
@@ -13,6 +13,7 @@ from common.signals import django_ready
from
common.utils.connection
import
RedisPubSub
from
common.utils
import
get_logger
from
assets.models
import
Asset
,
Node
from
orgs.models
import
Organization
logger
=
get_logger
(
__file__
)
...
...
@@ -36,13 +37,18 @@ node_assets_mapping_for_memory_pub_sub = NodeAssetsMappingForMemoryPubSub()
def
expire_node_assets_mapping_for_memory
(
org_id
):
# 所有进程清除(自己的 memory 数据)
org_id
=
str
(
org_id
)
node_assets_mapping_for_memory_pub_sub
.
publish
(
org_id
)
root_org_id
=
Organization
.
ROOT_ID
# 当前进程清除(cache 数据)
logger
.
debug
(
"Expire node assets id mapping from cache of org={}, pid={}"
""
.
format
(
org_id
,
os
.
getpid
())
)
Node
.
expire_node_all_asset_ids_mapping_from_cache
(
org_id
)
Node
.
expire_node_all_asset_ids_mapping_from_cache
(
root_org_id
)
node_assets_mapping_for_memory_pub_sub
.
publish
(
org_id
)
node_assets_mapping_for_memory_pub_sub
.
publish
(
root_org_id
)
@
receiver
(
post_save
,
sender
=
Node
)
...
...
@@ -73,16 +79,22 @@ def subscribe_node_assets_mapping_expire(sender, **kwargs):
logger
.
debug
(
"Start subscribe for expire node assets id mapping from memory"
)
def
keep_subscribe
():
subscribe
=
node_assets_mapping_for_memory_pub_sub
.
subscribe
()
for
message
in
subscribe
.
listen
():
if
message
[
"type"
]
!=
"message"
:
continue
org_id
=
message
[
'data'
].
decode
()
Node
.
expire_node_all_asset_ids_mapping_from_memory
(
org_id
)
logger
.
debug
(
"Expire node assets id mapping from memory of org={}, pid={}"
""
.
format
(
str
(
org_id
),
os
.
getpid
())
)
while
True
:
try
:
subscribe
=
node_assets_mapping_for_memory_pub_sub
.
subscribe
()
for
message
in
subscribe
.
listen
():
if
message
[
"type"
]
!=
"message"
:
continue
org_id
=
message
[
'data'
].
decode
()
Node
.
expire_node_all_asset_ids_mapping_from_memory
(
org_id
)
logger
.
debug
(
"Expire node assets id mapping from memory of org={}, pid={}"
""
.
format
(
str
(
org_id
),
os
.
getpid
())
)
except
Exception
as
e
:
logger
.
exception
(
f
'subscribe_node_assets_mapping_expire:
{
e
}
'
)
Node
.
expire_all_orgs_node_all_asset_ids_mapping_from_memory
()
t
=
threading
.
Thread
(
target
=
keep_subscribe
)
t
.
daemon
=
True
t
.
start
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录