AaronFiore/electrum
1
0
Fork 0
Code Activity

be more robust to "electrum/www" missing

Browse Source
This commit is contained in:
SomberNight
2022-10-19 14:14:24 +00:00
parent 0fc90e07c9
commit 60769e4769
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electrum/daemon.py
View File

@@ -359,14 +359,22 @@ class WatchTowerServer(AuthenticatedServer):
class PayServer(Logger, EventListener): class PayServer(Logger, EventListener):
WWW_DIR = os.path.join(os.path.dirname(__file__), 'www')
def __init__(self, daemon: 'Daemon', netaddress): def __init__(self, daemon: 'Daemon', netaddress):
Logger.__init__(self) Logger.__init__(self)
assert self.has_www_dir(), self.WWW_DIR
self.addr = netaddress self.addr = netaddress
self.daemon = daemon self.daemon = daemon
self.config = daemon.config self.config = daemon.config
self.pending = defaultdict(asyncio.Event) self.pending = defaultdict(asyncio.Event)
self.register_callbacks() self.register_callbacks()
@classmethod
def has_www_dir(cls) -> bool:
index_html = os.path.join(cls.WWW_DIR, "index.html")
return os.path.exists(index_html)
@property @property
def wallet(self): def wallet(self):
# FIXME specify wallet somehow? # FIXME specify wallet somehow?
@@ -385,7 +393,7 @@ class PayServer(Logger, EventListener):
app.add_routes([web.get('/api/get_invoice', self.get_request)]) app.add_routes([web.get('/api/get_invoice', self.get_request)])
app.add_routes([web.get('/api/get_status', self.get_status)]) app.add_routes([web.get('/api/get_status', self.get_status)])
app.add_routes([web.get('/bip70/{key}.bip70', self.get_bip70_request)]) app.add_routes([web.get('/bip70/{key}.bip70', self.get_bip70_request)])
app.add_routes([web.static(root, os.path.join(os.path.dirname(__file__), 'www'))]) app.add_routes([web.static(root, self.WWW_DIR)])
if self.config.get('payserver_allow_create_invoice'): if self.config.get('payserver_allow_create_invoice'):
app.add_routes([web.post('/api/create_invoice', self.create_request)]) app.add_routes([web.post('/api/create_invoice', self.create_request)])
runner = web.AppRunner(app) runner = web.AppRunner(app)
@@ -489,8 +497,11 @@ class Daemon(Logger):
self.pay_server = None self.pay_server = None
payserver_address = self.config.get_netaddress('payserver_address') payserver_address = self.config.get_netaddress('payserver_address')
if not config.get('offline') and payserver_address: if not config.get('offline') and payserver_address:
self.pay_server = PayServer(self, payserver_address) if PayServer.has_www_dir():
daemon_jobs.append(self.pay_server.run()) self.pay_server = PayServer(self, payserver_address)
daemon_jobs.append(self.pay_server.run())
else:
self.logger.error(f"PayServer configured but WWW_DIR missing or empty. skipping. ({PayServer.WWW_DIR})")
# server-side watchtower # server-side watchtower
self.watchtower = None self.watchtower = None
watchtower_address = self.config.get_netaddress('watchtower_address') watchtower_address = self.config.get_netaddress('watchtower_address')