Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
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
jumpserver
Commits
ddf60d25
Commit
ddf60d25
authored
Feb 22, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 添加jms日志和修改entrypoint
parent
3e6e0153
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
entrypoint.sh
entrypoint.sh
+3
-2
jms
jms
+4
-1
No files found.
entrypoint.sh
View file @
ddf60d25
...
@@ -12,9 +12,10 @@ if [[ "$1" != "" ]];then
...
@@ -12,9 +12,10 @@ if [[ "$1" != "" ]];then
service
=
$1
service
=
$1
fi
fi
trap
cleanup EXIT
if
[[
"
$1
"
==
"bash"
]]
;
then
if
[[
"
$1
"
==
"bash"
]]
;
then
bash
bash
else
python jms start
${
service
}
fi
fi
trap
cleanup EXIT
python jms start
${
service
}
jms
View file @
ddf60d25
...
@@ -17,6 +17,8 @@ try:
...
@@ -17,6 +17,8 @@ try:
except
ImportError
as
e
:
except
ImportError
as
e
:
print
(
"Not found __version__: {}"
.
format
(
e
))
print
(
"Not found __version__: {}"
.
format
(
e
))
print
(
"Sys path: {}"
.
format
(
sys
.
path
))
print
(
"Sys path: {}"
.
format
(
sys
.
path
))
print
(
"Python is: "
)
print
(
subprocess
.
call
(
'which python'
,
shell
=
True
))
__version__
=
'Unknown'
__version__
=
'Unknown'
try
:
try
:
import
apps
import
apps
...
@@ -28,7 +30,8 @@ except ImportError as e:
...
@@ -28,7 +30,8 @@ except ImportError as e:
try
:
try
:
from
apps.jumpserver.conf
import
load_user_config
from
apps.jumpserver.conf
import
load_user_config
CONFIG
=
load_user_config
()
CONFIG
=
load_user_config
()
except
ImportError
:
except
ImportError
as
e
:
print
(
"Import error: {}"
.
format
(
e
))
print
(
"Could not find config file, `cp config_example.yml config.yml`"
)
print
(
"Could not find config file, `cp config_example.yml config.yml`"
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
...
...
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