Spotter-Cluster/vmmgr
2
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore all errors and exceptions raised by update-conf.sh

Browse Source
This commit is contained in:
Disassembler 2020-04-10 14:07:41 +02:00
parent 2d788eb704
commit 67f71697fb
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr/lib/python3.8/vmmgr/vmmgr.py
View File

@ -173,14 +173,15 @@ def update_app_config(app_name=None):
env['PORT'] = host['port'] env['PORT'] = host['port']
env['EMAIL'] = common['email'] env['EMAIL'] = common['email']
env['GMAPS_API_KEY'] = common['gmaps-api-key'] env['GMAPS_API_KEY'] = common['gmaps-api-key']
app_names = [app_name] if app_name else repo_local.get_apps() app_names = [app_name] if app_name else repo_local.get_apps().keys()
for app_name in app_names: for app_name in app_names:
install_dir = os.path.join(spoc_config.APPS_DIR, app_name, 'install') install_dir = os.path.join(spoc_config.APPS_DIR, app_name, 'install')
script_path = os.path.join(install_dir, 'update-conf.sh') script_path = os.path.join(install_dir, 'update-conf.sh')
if os.path.exists(script_path): env['HOST'] = apps[app_name]['host']
app_env = env.copy() try:
app_env['HOST'] = apps[app_name]['host'] subprocess.run(script_path, cwd=install_dir, env=env)
subprocess.run(script_path, cwd=install_dir, env=app_env) except:
pass
def is_app_started(app_name): def is_app_started(app_name):
# Assume that the main container has always the same name as the app # Assume that the main container has always the same name as the app

2
usr/lib/python3.8/vmmgr/wsgiapp.py
View File

@ -8,7 +8,7 @@ from math import floor
from pkg_resources import parse_version from pkg_resources import parse_version
from spoc import repo_online, repo_local from spoc import repo_online, repo_local
from werkzeug.exceptions import HTTPException, NotFound, Unauthorized from werkzeug.exceptions import HTTPException, NotFound, Unauthorized
from werkzeug.routing import Map, Rule, RequestRedirect from werkzeug.routing import Map, Rule
from werkzeug.utils import redirect from werkzeug.utils import redirect
from werkzeug.wrappers import Request, Response from werkzeug.wrappers import Request, Response