Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
49a16655
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,发现更多精彩内容 >>
未验证
提交
49a16655
编写于
1月 08, 2019
作者:
baltery
提交者:
GitHub
1月 08, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bugfix (#2327)
* [Bugfix] 修复两个配置文件冲突问题 * [Update] Docker中不再提供配置文件
上级
0e1d3f93
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
45 addition
and
20 deletion
+45
-20
Dockerfile
Dockerfile
+0
-1
apps/jumpserver/conf.py
apps/jumpserver/conf.py
+20
-16
apps/ops/tasks.py
apps/ops/tasks.py
+22
-1
apps/terminal/tasks.py
apps/terminal/tasks.py
+1
-1
jms
jms
+2
-1
未找到文件。
Dockerfile
浏览文件 @
49a16655
...
...
@@ -12,7 +12,6 @@ RUN yum -y install epel-release && cd /tmp/requirements && \
RUN
cd
/tmp/requirements
&&
pip
install
-r
requirements.txt
COPY
. /opt/jumpserver
COPY
config_example.yml /opt/jumpserver/config.yml
VOLUME
/opt/jumpserver/data
VOLUME
/opt/jumpserver/logs
...
...
apps/jumpserver/conf.py
浏览文件 @
49a16655
...
...
@@ -340,29 +340,33 @@ defaults = {
}
def
load_user_config
():
sys
.
path
.
insert
(
0
,
PROJECT_DIR
)
config
=
Config
(
PROJECT_DIR
,
defaults
)
loaded
=
False
for
i
in
[
'config.yml'
,
'config.yaml'
]:
if
os
.
path
.
isfile
(
os
.
path
.
join
(
config
.
root_path
,
i
)):
config
.
from_yaml
(
i
)
loaded
=
True
def
load_from_object
(
config
):
try
:
from
config
import
config
as
c
config
.
from_object
(
c
)
loaded
=
True
return
True
except
ImportError
:
pass
return
False
try
:
config
.
from_yaml
(
'config.yml'
)
loaded
=
True
except
IOError
:
pass
def
load_from_yml
(
config
):
for
i
in
[
'config.yml'
,
'config.yaml'
]:
if
not
os
.
path
.
isfile
(
os
.
path
.
join
(
config
.
root_path
,
i
)):
continue
loaded
=
config
.
from_yaml
(
i
)
if
loaded
:
return
True
return
False
def
load_user_config
():
sys
.
path
.
insert
(
0
,
PROJECT_DIR
)
config
=
Config
(
PROJECT_DIR
,
defaults
)
loaded
=
load_from_object
(
config
)
if
not
loaded
:
loaded
=
load_from_yml
(
config
)
if
not
loaded
:
msg
=
"""
...
...
apps/ops/tasks.py
浏览文件 @
49a16655
# coding: utf-8
import
os
from
celery
import
shared_task
,
subtask
from
django.utils
import
timezone
from
common.utils
import
get_logger
,
get_object_or_none
from
.celery.utils
import
register_as_period_task
,
after_app_shutdown_clean
from
.models
import
Task
,
CommandExecution
from
.models
import
Task
,
CommandExecution
,
CeleryTask
logger
=
get_logger
(
__file__
)
...
...
@@ -48,6 +51,24 @@ def clean_tasks_adhoc_period():
ad
.
delete
()
@
shared_task
@
register_as_period_task
(
interval
=
3600
*
24
)
@
after_app_shutdown_clean
def
clean_celery_tasks_period
():
logger
.
debug
(
"Start clean celery task history"
)
one_month_ago
=
timezone
.
now
()
-
timezone
.
timedelta
(
days
=
30
)
tasks
=
CeleryTask
.
objects
.
filter
(
date_start__lt
=
one_month_ago
)
for
task
in
tasks
:
if
os
.
path
.
isfile
(
task
.
full_log_path
):
try
:
os
.
remove
(
task
.
full_log_path
)
except
(
FileNotFoundError
,
PermissionError
):
pass
task
.
delete
()
tasks
=
CeleryTask
.
objects
.
filter
(
date_start__isnull
=
True
)
tasks
.
delete
()
@
shared_task
def
hello
(
name
,
callback
=
None
):
print
(
"Hello {}"
.
format
(
name
))
...
...
apps/terminal/tasks.py
浏览文件 @
49a16655
...
...
@@ -25,7 +25,7 @@ logger = get_task_logger(__name__)
@
after_app_ready_start
@
after_app_shutdown_clean
def
delete_terminal_status_period
():
yesterday
=
timezone
.
now
()
-
datetime
.
timedelta
(
days
=
3
)
yesterday
=
timezone
.
now
()
-
datetime
.
timedelta
(
days
=
1
)
Status
.
objects
.
filter
(
date_created__lt
=
yesterday
).
delete
()
...
...
jms
浏览文件 @
49a16655
...
...
@@ -15,7 +15,8 @@ sys.path.append(BASE_DIR)
from
apps
import
__version__
try
:
from
config
import
config
as
CONFIG
from
apps.jumpserver.conf
import
load_user_config
CONFIG
=
load_user_config
()
except
ImportError
:
print
(
"Could not find config file, `cp config_example.py config.py`"
)
sys
.
exit
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录