Update server_info on port open status change

This commit is contained in:
shortcutme 2017-11-05 23:43:51 +01:00
parent 3b7750c24e
commit 4465146615
No known key found for this signature in database
GPG Key ID: 5B63BAE6CB9613AE
2 changed files with 11 additions and 6 deletions

View File

@ -29,6 +29,7 @@ class FileServer(ConnectionServer):
self.sites = {}
self.last_request = time.time()
self.files_parsing = {}
self.ui_server = None
# Handle request to fileserver
def handleRequest(self, connection, message):
@ -80,9 +81,9 @@ class FileServer(ConnectionServer):
if self.testOpenport(port)["result"] is True:
self.upnp_port_opened = True
return True
self.log.info("Upnp mapping failed :( Please forward port %s on your router to your ipaddress" % port)
return False
else:
self.log.info("Upnp mapping failed :( Please forward port %s on your router to your ipaddress" % port)
return False
# Test if the port is open
def testOpenport(self, port=None, use_alternative=True):
@ -90,9 +91,12 @@ class FileServer(ConnectionServer):
port = self.port
back = self.testOpenportPortchecker(port)
if back["result"] is not True and use_alternative: # If no success try alternative checker
return self.testOpenportCanyouseeme(port)
else:
return back
back = self.testOpenportCanyouseeme(port)
if self.ui_server:
self.ui_server.updateWebsocket()
return back
def testOpenportP2P(self, port=None):
self.log.info("Checking port %s using P2P..." % port)

View File

@ -163,6 +163,7 @@ class Actions(object):
file_server = FileServer()
logging.info("Creating UiServer....")
ui_server = UiServer()
file_server.ui_server = ui_server
logging.info("Removing old SSL certs...")
from Crypt import CryptConnection