external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

more fixes!

Browse source
This commit is contained in:
Jordan Rodgers 2019-02-19 23:36:43 -05:00
parent daa994ba32
commit d19522cab5
12 changed files with 100 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

15
proxstar/vnc.py
View file

@ -1,10 +1,13 @@
import os
import time
import requests
import subprocess
from sshtunnel import SSHTunnelForwarder
from proxstar.util import *
import time
import requests
from flask import current_app as app
from sshtunnel import SSHTunnelForwarder
from proxstar import logging
from proxstar.util import *
def stop_websockify():
@ -18,7 +21,7 @@ def stop_websockify():
time.sleep(10)
if subprocess.run(['pgrep', 'websockify'],
stdout=subprocess.PIPE).stdout:
print('Websockify didn\'t stop, killing forcefully.')
logging.info('websockify didn\'t stop, killing forcefully.')
subprocess.run(['kill', '-9', pid], stdout=subprocess.PIPE)
@ -83,7 +86,7 @@ def stop_ssh_tunnel(vmid, ssh_tunnels):
(tunnel for tunnel in ssh_tunnels if tunnel.local_bind_port == port),
None)
if tunnel:
print("Tearing down SSH tunnel for VM {}.".format(vmid))
logging.info("Tearing down SSH tunnel for VM {}.".format(vmid))
try:
tunnel.stop()
except: