From 0ef7efde3be75e3bdc97155ac24883e143b9167a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Wed, 5 Oct 2022 13:12:16 +0200 Subject: [PATCH] reintroduce signalhandler and ad encrypted macaroon --- lnbits/app.py | 10 +++++----- lnbits/settings.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lnbits/app.py b/lnbits/app.py index da8b058c..5afd521c 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -81,10 +81,10 @@ async def check_funding_source() -> None: # original_sigint_handler = signal.getsignal(signal.SIGINT) - # def signal_handler(signal, frame): - # logger.debug(f"SIGINT received, terminating LNbits.") - # sys.exit(1) - # signal.signal(signal.SIGINT, signal_handler) + def signal_handler(signal, frame): + logger.debug(f"SIGINT received, terminating LNbits.") + sys.exit(1) + signal.signal(signal.SIGINT, signal_handler) WALLET = get_wallet_class() while True: @@ -100,7 +100,7 @@ async def check_funding_source() -> None: pass logger.info("Retrying connection to backend in 5 seconds...") await asyncio.sleep(5) - # signal.signal(signal.SIGINT, original_sigint_handler) + 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 1ccf60a7..96a3f397 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -86,6 +86,7 @@ class Settings(BaseSettings): lnd_rest_endpoint: Optional[str] = Field(default=None) lnd_rest_cert: Optional[str] = Field(default=None) lnd_rest_macaroon: Optional[str] = Field(default=None) + lnd_rest_macaroon_encrypted: Optional[str] = Field(default=None) lnpay_api_endpoint: Optional[str] = Field(default=None) lnpay_api_key: Optional[str] = Field(default=None) lnpay_wallet_key: Optional[str] = Field(default=None)