beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

n8n excption

Browse source
This commit is contained in:
qiaofeng1227 2023-05-23 10:08:59 +08:00
parent 19e190fc7a
commit d141051305
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appmanage/Dockerfile
View file

@ -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

6
appmanage/api/service/manage.py
View file

@ -362,7 +362,7 @@ def get_apps_from_compose():
else:
default_domain = domain
except IndexError:
pass
myLogger.info_logger("domain exception")
try:
app_version = env_map.get("APP_VERSION")
volume_data = "/data/apps/" + customer_name + "/data"
@ -378,7 +378,7 @@ def get_apps_from_compose():
if default_domain != "" and admin_path != "":
admin_domain_url = "http://" + default_domain + admin_path
except IndexError:
pass
myLogger.info_logger("APP_USER POWER_PASSWORD exception")
try:
replace = env_map.get("APP_URL_REPLACE","false")
myLogger.info_logger("replace="+replace)
@ -388,7 +388,7 @@ def get_apps_from_compose():
if https == "true":
app_https = True
except IndexError:
pass
myLogger.info_logger("APP_HTTPS_ACCESS exception")
try:
http_port = env_map.get("APP_HTTP_PORT","0")

2
appmanage/api/v1/routers/apps.py
View file

@ -69,10 +69,12 @@ def AppStatus(request: Request,app_id: Optional[str] = Query(default=None, descr
ret = {}
ret['ResponseData'] = manage.get_app_status(app_id)
except CommandException as ce:
myLogger.info_logger(ce.message)
ret = {}
ret['ResponseData'] = None
ret['Error'] = manage.get_error_info(ce.code, ce.message, ce.detail)
except Exception as e:
myLogger.info_logger(e)
ret = {}
ret['ResponseData'] = None
ret['Error'] = manage.get_error_info(const.ERROR_SERVER_SYSTEM, "system original error", str(e))