github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-17 00:11:42 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 添加jms日志和修改entrypoint

Browse Source
This commit is contained in:
ibuler 2019-02-22 16:33:27 +08:00
parent 3e6e0153cf
commit ddf60d2512
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
entrypoint.sh
View File

@ -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}

5
jms
View File

@ -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:
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)