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

perf: 去除 applet 脚本的退出弹窗 (#9525) 

Co-authored-by: Eric <xplzv@126.com>
pull/9526/head
fit2bot 2023-02-13 17:11:43 +08:00 committed by GitHub
parent fcad5c637a
commit 66b248db77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/terminal/applets/chrome/common.py
View File

@ -59,12 +59,12 @@ def check_pid_alive(pid) -> bool:
content = decode_content(csv_ret) content = decode_content(csv_ret)
content_list = content.strip().split("\r\n") content_list = content.strip().split("\r\n")
if len(content_list) != 2: if len(content_list) != 2:
notify_err_message(content) print("check pid {} ret invalid: {}".format(pid, content))
return False return False
ret_pid = content_list[1].split(",")[1].strip('"') ret_pid = content_list[1].split(",")[1].strip('"')
return str(pid) == ret_pid return str(pid) == ret_pid
except Exception as e: except Exception as e:
notify_err_message(e) print("check pid {} err: {}".format(pid, e))
return False return False
@ -73,7 +73,7 @@ def wait_pid(pid):
time.sleep(5) time.sleep(5)
ok = check_pid_alive(pid) ok = check_pid_alive(pid)
if not ok: if not ok:
notify_err_message("程序退出") print("pid {} is not alive".format(pid))
break break

9
apps/terminal/applets/navicat/common.py
View File

@ -59,14 +59,12 @@ def check_pid_alive(pid) -> bool:
content = decode_content(csv_ret) content = decode_content(csv_ret)
content_list = content.strip().split("\r\n") content_list = content.strip().split("\r\n")
if len(content_list) != 2: if len(content_list) != 2:
notify_err_message(content) print("check pid {} ret invalid: {}".format(pid, content))
time.sleep(2)
return False return False
ret_pid = content_list[1].split(",")[1].strip('"') ret_pid = content_list[1].split(",")[1].strip('"')
return str(pid) == ret_pid return str(pid) == ret_pid
except Exception as e: except Exception as e:
notify_err_message(e) print("check pid {} err: {}".format(pid, e))
time.sleep(2)
return False return False
@ -75,8 +73,7 @@ def wait_pid(pid):
time.sleep(5) time.sleep(5)
ok = check_pid_alive(pid) ok = check_pid_alive(pid)
if not ok: if not ok:
notify_err_message("程序退出") print("pid {} is not alive".format(pid))
time.sleep(2)
break break