|
|
@@ -155,11 +155,11 @@ def install_app_process(app_name):
|
|
|
|
|
|
def install_app(app_name, customer_app_name, app_version, app_force):
|
|
|
|
|
|
- # if app_force == False:
|
|
|
- # if docker.check_vm_resource(app_name) == False:
|
|
|
- # ret = Response(code=const.RETURN_FAIL , message="系统资源不足，继续安装可能导致应用无法运行或服务器异常！")
|
|
|
- # ret = ret.dict()
|
|
|
- # return ret
|
|
|
+ if app_force == False:
|
|
|
+ if docker.check_vm_resource(app_name) == False:
|
|
|
+ ret = Response(code=const.RETURN_FAIL , message="系统资源(内存、CPU、磁盘)不足，继续安装可能导致应用无法运行或服务器异常！")
|
|
|
+ ret = ret.dict()
|
|
|
+ return ret
|
|
|
|
|
|
app_file_path = '/data/apps/'+app_name
|
|
|
running_file_path = "/data/apps/running_apps.txt"
|
qiaofeng1227