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

Merge branch 'pubkey' into dev

pull/1100/head
ibuler 2018-03-19 16:24:59 +08:00
parent 2fc9c04228 2156e0f51a
commit 0bba840e4d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jms
View File

@ -29,6 +29,7 @@ HTTP_PORT = CONFIG.HTTP_LISTEN_PORT or 8080
DEBUG = CONFIG.DEBUG DEBUG = CONFIG.DEBUG
LOG_LEVEL = CONFIG.LOG_LEVEL LOG_LEVEL = CONFIG.LOG_LEVEL
START_TIMEOUT = 15
WORKERS = 4 WORKERS = 4
DAEMON = False DAEMON = False
@ -214,11 +215,16 @@ def start_service(s):
p = func() p = func()
processes.append(p) processes.append(p)
time.sleep(5) now = int(time.time())
for i in services_set: for i in services_set:
if not is_running(i): while not is_running(i):
print("Error: {} start error".format(i)) if int(time.time()) - now < START_TIMEOUT:
stop_multi_services(services_set) time.sleep(1)
continue
else:
print("Error: {} start error".format(i))
stop_multi_services(services_set)
return
stop_event = threading.Event() stop_event = threading.Event()