From e93fbd24be6cf8959bbdeb90a0d8284497cbee0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 2 Mar 2023 12:03:58 +0100 Subject: [PATCH] FEAT: add funding source fallback and VoidWallet warning for frontend --- lnbits/app.py | 26 ++++++++++++++++++++++++-- lnbits/settings.py | 5 +++-- lnbits/templates/base.html | 3 +++ pyproject.toml | 3 ++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/lnbits/app.py b/lnbits/app.py index a3f719ed5..65acea2e4 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -105,20 +105,42 @@ async def check_funding_source() -> None: signal.signal(signal.SIGINT, signal_handler) WALLET = get_wallet_class() + + # fallback to void after 30 seconds of failures + sleep_time = 5 + timeout = int(30 / sleep_time) + + balance = 0 + retry_counter = 0 + while True: try: error_message, balance = await WALLET.status() if not error_message: + retry_counter = 0 break + logger.error( f"The backend for {WALLET.__class__.__name__} isn't working properly: '{error_message}'", RuntimeWarning, ) except: pass - logger.info("Retrying connection to backend in 5 seconds...") - await asyncio.sleep(5) + + if retry_counter == timeout: + logger.warning( + f"Fallback to VoidWallet, because the backend for {WALLET.__class__.__name__} isn't working properly" + ) + set_wallet_class("VoidWallet") + WALLET = get_wallet_class() + break + else: + logger.warning(f"Retrying connection to backend in {sleep_time} seconds...") + retry_counter += 1 + await asyncio.sleep(sleep_time) + signal.signal(signal.SIGINT, original_sigint_handler) + logger.info( f"✔️ Backend {WALLET.__class__.__name__} connected and with a balance of {balance} msat." ) diff --git a/lnbits/settings.py b/lnbits/settings.py index 75c20a9ad..78a0c76e2 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -317,8 +317,9 @@ def set_cli_settings(**kwargs): # set wallet class after settings are loaded -def set_wallet_class(): - wallet_class = getattr(wallets_module, settings.lnbits_backend_wallet_class) +def set_wallet_class(class_name: Optional[str] = None): + backend_wallet_class = class_name or settings.lnbits_backend_wallet_class + wallet_class = getattr(wallets_module, backend_wallet_class) global WALLET WALLET = wallet_class() diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index 7cba2256b..d7eb54e60 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -45,6 +45,9 @@ {% block beta %} + + VoidWallet is active! Payments disabled +