Browse Source

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

pull/2423/head
ibuler 6 years ago
parent
commit
ddf60d2512
  1. 5
      entrypoint.sh
  2. 5
      jms

5
entrypoint.sh

@ -12,9 +12,10 @@ if [[ "$1" != "" ]];then
service=$1
fi
trap cleanup EXIT
if [[ "$1" == "bash" ]];then
bash
else
python jms start ${service}
fi
trap cleanup EXIT
python jms start ${service}

5
jms

@ -17,6 +17,8 @@ try:
except ImportError as e:
print("Not found __version__: {}".format(e))
print("Sys path: {}".format(sys.path))
print("Python is: ")
print(subprocess.call('which python', shell=True))
__version__ = 'Unknown'
try:
import apps
@ -28,7 +30,8 @@ except ImportError as e:
try:
from apps.jumpserver.conf import 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`")
sys.exit(1)

Loading…
Cancel
Save