From dc52a8a08bf1ad6c2e44acff3ce8c42f075da949 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 5 Sep 2018 14:33:21 +0200 Subject: [PATCH] Use shared file_server object when generating server info for websocket --- src/Ui/UiWebsocket.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index bdd89223..b7057a5b 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -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,