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

apppp_url

Browse source
This commit is contained in:
qiaofeng1227 2023-05-23 10:54:13 +08:00
parent d6053569a3
commit be02967c35
2 changed files with 7 additions and 7 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 ./ COPY requirements.txt main.py ./
RUN apt update RUN apt update
# Install supervisords # Install supervisord
RUN apt install -y supervisor RUN apt install -y supervisor
COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY config/cmd.sh /cmd.sh COPY config/cmd.sh /cmd.sh

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

@ -363,7 +363,7 @@ def get_apps_from_compose():
default_domain = "" default_domain = ""
else: else:
default_domain = domain default_domain = domain
except IndexError: except Exception:
myLogger.info_logger("domain exception") myLogger.info_logger("domain exception")
try: try:
app_version = env_map.get("APP_VERSION") app_version = env_map.get("APP_VERSION")
@ -379,7 +379,7 @@ def get_apps_from_compose():
if default_domain != "" and admin_path != "": if default_domain != "" and admin_path != "":
admin_domain_url = "http://" + default_domain + admin_path admin_domain_url = "http://" + default_domain + admin_path
except IndexError: except Exception:
myLogger.info_logger("APP_USER POWER_PASSWORD exception") myLogger.info_logger("APP_USER POWER_PASSWORD exception")
try: try:
replace = env_map.get("APP_URL_REPLACE","false") replace = env_map.get("APP_URL_REPLACE","false")
@ -389,14 +389,14 @@ def get_apps_from_compose():
https = env_map.get("APP_HTTPS_ACCESS","false") https = env_map.get("APP_HTTPS_ACCESS","false")
if https == "true": if https == "true":
app_https = True app_https = True
except IndexError: except Exception:
myLogger.info_logger("APP_HTTPS_ACCESS exception") myLogger.info_logger("APP_HTTPS_ACCESS exception")
try: try:
http_port = env_map.get("APP_HTTP_PORT","0") http_port = env_map.get("APP_HTTP_PORT","0")
if http_port: if http_port:
port = int(http_port) port = int(http_port)
except IndexError: except Exception:
pass pass
if port != 0: if port != 0:
try: try:
@ -406,13 +406,13 @@ def get_apps_from_compose():
easy_url = "http://" + ip + ":" + str(port) easy_url = "http://" + ip + ":" + str(port)
url = easy_url url = easy_url
admin_url = get_admin_url(customer_name, url) admin_url = get_admin_url(customer_name, url)
except IndexError: except Exception:
pass pass
else: else:
try: try:
db_port = list(docker.read_env(path, "APP_DB.*_PORT").values())[0] db_port = list(docker.read_env(path, "APP_DB.*_PORT").values())[0]
port = int(db_port) port = int(db_port)
except IndexError: except Exception:
pass pass
else: else:
app_name = customer_name app_name = customer_name