oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use shared file_server object when generating server info for websocket

Browse source
This commit is contained in:
shortcutme 2018-09-05 14:33:21 +02:00
parent 5f1e7ffd0c
commit dc52a8a08b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Ui/UiWebsocket.py
View file

@ -315,14 +315,15 @@ class UiWebsocket(object):
return ret
def formatServerInfo(self):
file_server = sys.modules["main"].file_server
return {
"ip_external": sys.modules["main"].file_server.port_opened,
"ip_external": file_server.port_opened,
"platform": sys.platform,
"fileserver_ip": config.fileserver_ip,
"fileserver_port": config.fileserver_port,
"tor_enabled": sys.modules["main"].file_server.tor_manager.enabled,
"tor_status": sys.modules["main"].file_server.tor_manager.status,
"tor_has_meek_bridges": sys.modules["main"].file_server.tor_manager.has_meek_bridges,
"tor_enabled": file_server.tor_manager.enabled,
"tor_status": file_server.tor_manager.status,
"tor_has_meek_bridges": file_server.tor_manager.has_meek_bridges,
"tor_use_bridges": config.tor_use_bridges,
"ui_ip": config.ui_ip,
"ui_port": config.ui_port,