AaronFiore/electrum
1
0
Fork 0
Code Activity

config: save ports instead of net addresses (follow-up 012ce1c1bb)

Browse Source
This commit is contained in:
ThomasV
2023-08-11 08:12:54 +02:00
parent 2557474449
commit 9f5f802cd1
5 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/daemon.py
View File

@@ -357,8 +357,8 @@ class CommandsServer(AuthenticatedServer):
class WatchTowerServer(AuthenticatedServer):
def __init__(self, network: 'Network', netaddress):
self.addr = netaddress
def __init__(self, network: 'Network', port:int):
self.port = port
self.config = network.config
self.network = network
watchtower_user = self.config.WATCHTOWER_SERVER_USER or ""
@@ -373,9 +373,9 @@ class WatchTowerServer(AuthenticatedServer):
async def run(self):
self.runner = web.AppRunner(self.app)
await self.runner.setup()
site = web.TCPSite(self.runner, host=str(self.addr.host), port=self.addr.port)
site = web.TCPSite(self.runner, host='localhost', port=self.port)
await site.start()
self.logger.info(f"now running and listening. addr={self.addr}")
self.logger.info(f"running and listening on port {self.port}")
async def get_ctn(self, *args):
return await self.lnwatcher.get_ctn(*args)
@@ -453,8 +453,8 @@ class Daemon(Logger):
assert not self.config.NETWORK_OFFLINE
assert self.network
# server-side watchtower
if watchtower_address := self.config.get_netaddress(self.config.cv.WATCHTOWER_SERVER_ADDRESS):
self.watchtower = WatchTowerServer(self.network, watchtower_address)
if watchtower_port := self.config.WATCHTOWER_SERVER_PORT:
self.watchtower = WatchTowerServer(self.network, watchtower_port)
asyncio.run_coroutine_threadsafe(self.taskgroup.spawn(self.watchtower.run), self.asyncio_loop)
self.network.start(jobs=[self.fx.run])