diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index ef28a3a5..d6cf741e 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py ./ RUN apt update -# Install supervisord +# Install supervisords RUN apt install -y supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/cmd.sh /cmd.sh diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index c7ca227f..df85de82 100644 --- a/appmanage/api/service/manage.py +++ b/appmanage/api/service/manage.py @@ -259,13 +259,13 @@ def install_app_delay(app_name, customer_name, app_version): raise Exception(error_info) except CommandException as ce: myLogger.info_logger(customer_name + " install failed(docker)!") - uninstall_app(job_id) + delete_app(job_id) error_info= "##websoft9##" + ce.code + "##websoft9##" + ce.message + "##websoft9##" + ce.detail myLogger.info_logger(error_info) raise Exception(error_info) except Exception as e: myLogger.info_logger(customer_name + " install failed(system)!") - uninstall_app(job_id) + delete_app(job_id) error_info= "##websoft9##" + const.ERROR_SERVER_SYSTEM + "##websoft9##" + 'system original error' + "##websoft9##" + str(e) myLogger.info_logger(error_info) raise Exception(error_info)