AaronFiore/electrum
1
0
Fork 0
Code Activity

add PayServer settings to settings_dialog

Browse Source
This commit is contained in:
ThomasV
2019-09-05 14:43:27 +02:00
parent 96d3c36e4a
commit 28da62f51b
3 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/daemon.py
View File

@@ -185,9 +185,9 @@ class HttpServer(Logger):
await self.pending[key].set()
async def run(self):
host = self.config.get('http_host', 'localhost')
port = self.config.get('http_port')
root = self.config.get('http_root', '/r')
host = self.config.get('payserver_host', 'localhost')
port = self.config.get('payserver_port')
root = self.config.get('payserver_root', '/r')
ssl_keyfile = self.config.get('ssl_keyfile')
ssl_certfile = self.config.get('ssl_certfile')
if ssl_keyfile and ssl_certfile:
@@ -289,7 +289,7 @@ class Daemon(Logger):
if listen_jsonrpc:
jobs.append(self.start_jsonrpc(config, fd))
# request server
if self.config.get('http_port'):
if self.config.get('payserver_port'):
self.http_server = HttpServer(self)
jobs.append(self.http_server.run())
# server-side watchtower