Merge pull request #1936 from ser/websocket_announce
Introducing websocket_announce configuration
This commit is contained in:
commit
71d52d6349
|
@ -1054,7 +1054,15 @@ class Abstract_Wallet(PrintError):
|
||||||
out['request_url'] = os.path.join(baseurl, key)
|
out['request_url'] = os.path.join(baseurl, key)
|
||||||
out['URI'] += '&r=' + out['request_url']
|
out['URI'] += '&r=' + out['request_url']
|
||||||
out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
|
out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
|
||||||
|
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')
|
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)
|
out['websocket_port'] = config.get('websocket_port', 9999)
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue