github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-02-03 09:48:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

update AppList AppStatus

Browse Source
This commit is contained in:
TooY 2023-04-17 09:54:03 +08:00
parent 849db0bada
commit 73b6b30edc
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
appmanage/api/service/manage.py
View File

@ -36,39 +36,34 @@ def AppList():
# 获取所有app的信息 # 获取所有app的信息
def get_my_app(app_id): def get_my_app(app_id):
myLogger.info_logger("Search all of apps ...") installed_list = get_apps_from_compose()
cmd = "docker compose ls -a --format json"
output = shell_execute.execute_command_output_all(cmd)
output_list = json.loads(output["result"])
installed_list, has_add = get_apps_from_compose(output_list)
installing_list = get_apps_from_queue() installing_list = get_apps_from_queue()
app_list = installed_list + installing_list app_list = installed_list + installing_list
# find = False find = False
# ret = {} ret = {}
# if app_id != None: if app_id != None:
# for app in app_list: for app in app_list:
# if app_id == app.app_id: if app_id == app['app_id']:
# ret = app ret = app
# find = True find = True
# break break
# if not find: if not find:
# raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "This App doesn't exist!", "") raise CommandException(const.ERROR_CLIENT_PARAM_NOTEXIST, "This App doesn't exist!", "")
# else: else:
# ret = app_list ret = app_list
myLogger.info_logger("app list result ok") myLogger.info_logger("app list result ok")
return app_list return ret
# 获取具体某个app的信息 # 获取具体某个app的信息
def get_app_status(app_id): def get_app_status(app_id):
code, message = docker.check_app_id(app_id) code, message = docker.check_app_id(app_id)
customer_app_name = app_id.split('_')[1]
if code == None: if code == None:
app = get_my_app(customer_app_name) app = get_my_app(app_id)
# 将app_list 过滤出app_id的app，并缩减信息，使其符合文档的要求 # 将app_list 过滤出app_id的app，并缩减信息，使其符合文档的要求
ret = {} ret = {}
ret['app_id'] = app.app_id ret['app_id'] = app['app_id']
app['status'] = app.status ret['status'] = app['status']
app['status_reason'] = app.status_reason ret['status_reason'] = app['status_reason']
else: else:
raise CommandException(code, message, '') raise CommandException(code, message, '')
@ -262,12 +257,15 @@ def app_exits_in_docker(app_id):
def split_app_id(app_id): def split_app_id(app_id):
return app_id.split("_")[1] return app_id.split("_")[1]
def get_apps_from_compose(output_list): def get_apps_from_compose():
myLogger.info_logger("Search all of apps ...")
cmd = "docker compose ls -a --format json"
output = shell_execute.execute_command_output_all(cmd)
output_list = json.loads(output["result"])
myLogger.info_logger(len(output_list)) myLogger.info_logger(len(output_list))
ip_result = shell_execute.execute_command_output_all("curl ifconfig.me") ip_result = shell_execute.execute_command_output_all("curl ifconfig.me")
ip = ip_result["result"] ip = ip_result["result"]
app_list = [] app_list = []
has_add = []
for app_info in output_list: for app_info in output_list:
volume = app_info["ConfigFiles"] # volume volume = app_info["ConfigFiles"] # volume
app_path = volume.rsplit('/', 1)[0] app_path = volume.rsplit('/', 1)[0]
@ -329,8 +327,6 @@ def get_apps_from_compose(output_list):
except IndexError: except IndexError:
pass pass
has_add.append(customer_name)
running_info = RunningInfo(port=port, compose_file=volume, url=url, admin_url=admin_url, running_info = RunningInfo(port=port, compose_file=volume, url=url, admin_url=admin_url,
user_name=user_name, password=password, default_domain="", set_domain="") user_name=user_name, password=password, default_domain="", set_domain="")
status_reason = StatusReason(Code="", Message="", Detail="") status_reason = StatusReason(Code="", Message="", Detail="")
@ -339,7 +335,7 @@ def get_apps_from_compose(output_list):
status_reason=status_reason, official_app=official_app, image_url=image_url, status_reason=status_reason, official_app=official_app, image_url=image_url,
running_info=running_info) running_info=running_info)
app_list.append(app.dict()) app_list.append(app.dict())
return app_list, has_add return app_list
def check_if_official_app(var_path): def check_if_official_app(var_path):
if docker.check_directory(var_path): if docker.check_directory(var_path):
@ -432,7 +428,7 @@ def get_rq_app(id, status, code, message, detail):
app = App(app_id=id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark, app = App(app_id=id, app_name=app_name, customer_name=customer_name, trade_mark=trade_mark,
status=status, status_reason=status_reason, official_app=True, image_url=image_url, status=status, status_reason=status_reason, official_app=True, image_url=image_url,
running_info=running_info) running_info=running_info)
return app return app.dict()
def get_Image_url(app_name): def get_Image_url(app_name):
image_url = "static/images/" + app_name + "-websoft9.png" image_url = "static/images/" + app_name + "-websoft9.png"