diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 5d86e70..dcfadfe 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -2,6 +2,7 @@ import os import subprocess from flask import Flask + app = Flask(__name__) if os.path.exists(os.path.join(app.config.get('ROOT_DIR', os.getcwd()), "config_local.py")): config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), "config_local.py") diff --git a/proxstar/__init__.py b/proxstar/__init__.py index bf947f1..f770025 100644 --- a/proxstar/__init__.py +++ b/proxstar/__init__.py @@ -335,9 +335,7 @@ def vm_console(vmid): if user.rtp or int(vmid) in user.allowed_vms: # import pdb; pdb.set_trace() vm = VM(vmid) - vnc_ticket, vnc_port = open_vnc_session( - vmid, vm.node, proxmox - ) + vnc_ticket, vnc_port = open_vnc_session(vmid, vm.node, proxmox) node = f'{vm.node}.csh.rit.edu' token = add_vnc_target(node, vnc_port) redis_conn.set(f'vnc_token|{vmid}', str(token)) # Store the VNC token in Redis. diff --git a/proxstar/vnc.py b/proxstar/vnc.py index 63a7dae..8b210da 100644 --- a/proxstar/vnc.py +++ b/proxstar/vnc.py @@ -3,7 +3,6 @@ import subprocess import time import urllib.parse -import requests from flask import current_app as app from proxstar import logging @@ -85,4 +84,4 @@ def open_vnc_session(vmid, node, proxmox): params = {'websocket': '1', 'generate-password': '0'} vncproxy_response_data = proxmox.nodes(node).qemu(str(vmid)).vncproxy.post(**params) - return urllib.parse.quote_plus(vncproxy_response_data['ticket']) vncproxy_response_data['port'] + return urllib.parse.quote_plus(vncproxy_response_data['ticket']), vncproxy_response_data['port']