Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
coco
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
coco
Commits
21efdc90
Commit
21efdc90
authored
Jan 29, 2018
by
广宏伟
Browse files
Options
Browse Files
Download
Plain Diff
Merged in test (pull request #17)
Test
parents
dd8e5568
1a691f79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
app.py
coco/app.py
+6
-2
conf_docker.py
conf_docker.py
+1
-1
No files found.
coco/app.py
View file @
21efdc90
...
...
@@ -29,7 +29,8 @@ logger = get_logger(__file__)
class
Coco
:
config_class
=
Config
default_config
=
{
'NAME'
:
socket
.
gethostname
(),
'DEFAULT_NAME'
:
socket
.
gethostname
(),
'NAME'
:
None
,
'CORE_HOST'
:
'http://127.0.0.1:8080'
,
'DEBUG'
:
True
,
'BIND_HOST'
:
'0.0.0.0'
,
...
...
@@ -68,7 +69,10 @@ class Coco:
@property
def
name
(
self
):
return
self
.
config
[
"NAME"
]
if
self
.
config
[
'NAME'
]:
return
self
.
config
[
'NAME'
]
else
:
return
self
.
config
[
'DEFAULT_NAME'
]
@property
def
service
(
self
):
...
...
conf_docker.py
View file @
21efdc90
...
...
@@ -12,7 +12,7 @@ class Config:
Coco config file
"""
# 默认的名字
NAME
=
os
.
environ
.
get
(
"
APP_
NAME"
)
or
None
NAME
=
os
.
environ
.
get
(
"NAME"
)
or
None
# Jumpserver项目的url, api请求注册会使用
CORE_HOST
=
os
.
environ
.
get
(
"CORE_HOST"
)
or
'http://core:8080'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment