Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
2d10e130
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 搜索 >>
未验证
提交
2d10e130
编写于
4月 04, 2018
作者:
baltery
提交者:
GitHub
4月 04, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1171 from jumpserver/dev
Dev
上级
82d06351
1d7ba3e2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
2 deletion
+12
-2
apps/assets/models/asset.py
apps/assets/models/asset.py
+1
-1
apps/ops/celery/signal_handler.py
apps/ops/celery/signal_handler.py
+10
-0
apps/users/api.py
apps/users/api.py
+1
-1
未找到文件。
apps/assets/models/asset.py
浏览文件 @
2d10e130
...
...
@@ -49,7 +49,7 @@ class Asset(models.Model):
ip
=
models
.
GenericIPAddressField
(
max_length
=
32
,
verbose_name
=
_
(
'IP'
),
db_index
=
True
)
hostname
=
models
.
CharField
(
max_length
=
128
,
unique
=
True
,
verbose_name
=
_
(
'Hostname'
))
port
=
models
.
IntegerField
(
default
=
22
,
verbose_name
=
_
(
'Port'
))
domain
=
models
.
ForeignKey
(
"assets.Domain"
,
null
=
True
,
blank
=
True
,
related_name
=
'assets'
,
verbose_name
=
_
(
"Domain"
))
domain
=
models
.
ForeignKey
(
"assets.Domain"
,
null
=
True
,
blank
=
True
,
related_name
=
'assets'
,
verbose_name
=
_
(
"Domain"
)
,
on_delete
=
models
.
SET_NULL
)
nodes
=
models
.
ManyToManyField
(
'assets.Node'
,
default
=
default_node
,
related_name
=
'assets'
,
verbose_name
=
_
(
"Nodes"
))
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Is active'
))
...
...
apps/ops/celery/signal_handler.py
浏览文件 @
2d10e130
...
...
@@ -3,6 +3,7 @@
import
os
import
datetime
import
sys
import
time
from
django.conf
import
settings
from
django.utils
import
timezone
...
...
@@ -53,10 +54,19 @@ def after_task_publish_signal_handler(sender, headers=None, **kwargs):
CeleryTask
.
objects
.
create
(
id
=
headers
[
"id"
],
status
=
CeleryTask
.
WAITING
,
name
=
headers
[
"task"
]
)
cache
.
set
(
headers
[
"id"
],
True
,
3600
)
@
task_prerun
.
connect
def
pre_run_task_signal_handler
(
sender
,
task_id
=
None
,
task
=
None
,
**
kwargs
):
time
.
sleep
(
0.1
)
for
i
in
range
(
5
):
if
cache
.
get
(
task_id
,
False
):
break
else
:
time
.
sleep
(
0.1
)
continue
t
=
get_object_or_none
(
CeleryTask
,
id
=
task_id
)
if
t
is
None
:
logger
.
warn
(
"Not get the task: {}"
.
format
(
task_id
))
...
...
apps/users/api.py
浏览文件 @
2d10e130
...
...
@@ -28,7 +28,7 @@ class UserViewSet(IDInFilterMixin, BulkModelViewSet):
queryset
=
User
.
objects
.
exclude
(
role
=
"App"
)
# queryset = User.objects.all().exclude(role="App").order_by("date_joined")
serializer_class
=
UserSerializer
permission_classes
=
(
IsSuperUser
,
IsAuthenticated
)
permission_classes
=
(
IsSuperUser
OrAppUser
,
IsAuthenticated
)
filter_fields
=
(
'username'
,
'email'
,
'name'
,
'id'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录