github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 解决打印print失败问题，原因在于运行docker没有tty，也可以添加PYTHONIOENCODING环境变量解决

pull/828/merge
ibuler 2018-01-01 23:45:27 +08:00
parent f4a39aba00
commit 5eef584c7d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
run_server.py
View File

@ -7,7 +7,6 @@ import threading
import time import time
import argparse import argparse
import sys import sys
import io
from apps import __version__ from apps import __version__
@ -16,6 +15,7 @@ try:
except ImportError: except ImportError:
CONFIG = type('_', (), {'__getattr__': None})() CONFIG = type('_', (), {'__getattr__': None})()
os.environ["PYTHONIOENCODING"] = "UTF-8"
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
APPS_DIR = os.path.join(BASE_DIR, 'apps') APPS_DIR = os.path.join(BASE_DIR, 'apps')
@ -86,12 +86,12 @@ def start_beat():
os.environ.setdefault('C_FORCE_ROOT', '1') os.environ.setdefault('C_FORCE_ROOT', '1')
pidfile = '/tmp/beat.pid' pidfile = '/tmp/beat.pid'
if os.path.exists(pidfile): if os.path.exists(pidfile):
print("Beat pid file `` exist, remove it".format(pidfile)) print("Beat pid file `{}` exist, remove it".format(pidfile))
os.unlink(pidfile) os.unlink(pidfile)
time.sleep(0.5) time.sleep(0.5)
if os.path.exists(pidfile): if os.path.exists(pidfile):
print("Beat pid file `` exist yet, may be something wrong".format(pidfile)) print("Beat pid file `{}` exist yet, may be something wrong".format(pidfile))
os.unlink(pidfile) os.unlink(pidfile)
time.sleep(0.5) time.sleep(0.5)
@ -147,7 +147,12 @@ def stop_service():
os.unlink('/tmp/beat.pid') os.unlink('/tmp/beat.pid')
start_service('all') if __name__ == '__main__':
parser = argparse.ArgumentParser(description="Jumpserver start tools")
parser.add_argument("services", type=str, nargs='+', default="all",
choices=("all", "gunicorn", "celery", "beat"),
help="The service to start",
)
args = parser.parse_args()
start_service(args.services)