Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
6586bef8
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,发现更多精彩内容 >>
提交
6586bef8
编写于
12月 30, 2017
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Modify] Add access log
上级
e0a3fafb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
9 deletion
+13
-9
apps/assets/models/asset.py
apps/assets/models/asset.py
+3
-3
apps/assets/signals_handler.py
apps/assets/signals_handler.py
+0
-1
apps/assets/views/asset.py
apps/assets/views/asset.py
+4
-4
run_server.py
run_server.py
+6
-1
未找到文件。
apps/assets/models/asset.py
浏览文件 @
6586bef8
...
...
@@ -33,9 +33,9 @@ class Asset(models.Model):
(
'Storage'
,
_
(
"Storage"
)),
)
ENV_CHOICES
=
(
(
'Prod'
,
'Production'
),
(
'Dev'
,
'Development'
),
(
'Test'
,
'Testing'
),
(
'Prod'
,
_
(
'Production'
)
),
(
'Dev'
,
_
(
'Development'
)
),
(
'Test'
,
_
(
'Testing'
)
),
)
# Important
...
...
apps/assets/signals_handler.py
浏览文件 @
6586bef8
...
...
@@ -76,7 +76,6 @@ def on_system_user_created_or_updated(sender, instance=None, **kwargs):
@
receiver
(
post_init
,
sender
=
Cluster
,
dispatch_uid
=
"my_unique_identifier"
)
def
on_cluster_init
(
sender
,
instance
,
**
kwargs
):
logger
.
debug
(
"On cluster init"
)
instance
.
__original_assets
=
tuple
(
instance
.
assets
.
values_list
(
'pk'
,
flat
=
True
))
# instance.__origin_system_users = tuple(instance.systemuser_set.all())
...
...
apps/assets/views/asset.py
浏览文件 @
6586bef8
...
...
@@ -44,8 +44,8 @@ class AssetListView(AdminUserRequiredMixin, TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
'app'
:
'Assets'
,
'action'
:
'Asset list'
,
'app'
:
_
(
'Assets'
)
,
'action'
:
_
(
'Asset list'
)
,
# 'groups': AssetGroup.objects.all(),
'system_users'
:
SystemUser
.
objects
.
all
(),
}
...
...
@@ -58,8 +58,8 @@ class UserAssetListView(LoginRequiredMixin, TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
'app'
:
'Assets'
,
'action'
:
'Asset list'
,
'app'
:
_
(
'Assets'
)
,
'action'
:
_
(
'Asset list'
)
,
'system_users'
:
SystemUser
.
objects
.
all
(),
}
kwargs
.
update
(
context
)
...
...
run_server.py
浏览文件 @
6586bef8
...
...
@@ -51,7 +51,12 @@ def start_gunicorn():
make_migrations
()
collect_static
()
os
.
chdir
(
APPS_DIR
)
cmd
=
"gunicorn jumpserver.wsgi -b {}:{} -w {}"
.
format
(
HTTP_HOST
,
HTTP_PORT
,
WORKERS
)
cmd
=
"gunicorn jumpserver.wsgi -b {}:{} -w {} "
.
format
(
HTTP_HOST
,
HTTP_PORT
,
WORKERS
)
log_format
=
'%(h)s %(t)s "%(r)s" %(s)s %(b)s '
log
=
" --access-logfile - --access-logformat '{}' "
.
format
(
log_format
)
cmd
+=
log
if
DEBUG
:
cmd
+=
" --reload"
p
=
subprocess
.
Popen
(
cmd
,
shell
=
True
,
stdout
=
sys
.
stdout
,
stderr
=
sys
.
stderr
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录