electrum

commit 71d52d6349cd2a57ded3fb7859cc0c7452c5644c
parent 63a5e8f99b835e96925a3d268ef44ebe6309917b
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 27 Sep 2016 11:19:32 +0200

Merge pull request #1936 from ser/websocket_announce

Introducing websocket_announce configuration
Diffstat:
M
lib/wallet.py
 | 
12
++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -1054,8 +1054,16 @@ class Abstract_Wallet(PrintError):
                 out['request_url'] = os.path.join(baseurl, key)
                 out['URI'] += '&r=' + out['request_url']
                 out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
-                out['websocket_server'] = config.get('websocket_server', 'localhost')
-                out['websocket_port'] = config.get('websocket_port', 9999)
+                websocket_server_announce = config.get('websocket_server_announce')
+                if websocket_server_announce:
+                    out['websocket_server'] = websocket_server_announce
+                else:
+                    out['websocket_server'] = config.get('websocket_server', 'localhost')
+                websocket_port_announce = config.get('websocket_port_announce')
+                if websocket_port_announce:
+                    out['websocket_port'] = websocket_port_announce
+                else:
+                    out['websocket_port'] = config.get('websocket_port', 9999)
         return out
 
     def get_request_status(self, key):