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

Fix WSGI config reload

Browse Source
This commit is contained in:
Disassembler 2019-02-15 15:35:01 +01:00
parent 84ccc2bd84
commit f4efe179e4
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr/lib/python3.6/vmmgr/vmmgr.py
View File

@ -26,7 +26,7 @@ class VMMgr:
self.conf.save() self.conf.save()
# Attempt to contact running vmmgr WSGI application to reload config # Attempt to contact running vmmgr WSGI application to reload config
try: try:
requests.get('https://127.0.0.1/reload-config', timeout=3) requests.get('http://127.0.0.1:8080/reload-config', timeout=3)
except: except:
pass pass

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

@ -36,7 +36,7 @@ class WSGIApp:
Rule('/login', methods=['GET'], endpoint='login_view'), Rule('/login', methods=['GET'], endpoint='login_view'),
Rule('/login', methods=['POST'], endpoint='login_action'), Rule('/login', methods=['POST'], endpoint='login_action'),
Rule('/setup-host', redirect_to='/login?redir=setup-host'), Rule('/setup-host', redirect_to='/login?redir=setup-host'),
Rule('/setup-apps', redirect_to='/login?redir=setup-apps') Rule('/setup-apps', redirect_to='/login?redir=setup-apps'),
)) ))
self.admin_url_map = Map(( self.admin_url_map = Map((
Rule('/', endpoint='portal_view'), Rule('/', endpoint='portal_view'),
@ -60,10 +60,10 @@ class WSGIApp:
Rule('/uninstall-app', endpoint='uninstall_app_action'), Rule('/uninstall-app', endpoint='uninstall_app_action'),
Rule('/update-password', endpoint='update_password_action'), Rule('/update-password', endpoint='update_password_action'),
Rule('/shutdown-vm', endpoint='shutdown_vm_action'), Rule('/shutdown-vm', endpoint='shutdown_vm_action'),
Rule('/reboot-vm', endpoint='reboot_vm_action') Rule('/reboot-vm', endpoint='reboot_vm_action'),
)) ))
self.localhost_url_map = Map(( self.localhost_url_map = Map((
Rule('/reload-config', endpoint='reload_config_action') Rule('/reload-config', endpoint='reload_config_action'),
)) ))
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
@ -396,7 +396,7 @@ class WSGIApp:
def reload_config_action(self, request): def reload_config_action(self, request):
# Reload configuration (called by vmmgr.register_app()) # Reload configuration (called by vmmgr.register_app())
self.config.load() self.conf.load()
return Response(status=204) return Response(status=204)
def is_app_visible(self, app): def is_app_visible(self, app):