From 232de067a42baff356aa1fc2931aa1396917979a Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sun, 18 Apr 2021 10:50:07 -0300 Subject: [PATCH] expect more errors from SSE connection. --- lnbits/wallets/lnbits.py | 3 +-- lnbits/wallets/lntxbot.py | 2 +- lnbits/wallets/spark.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py index 13ea8046e..f55df5a71 100644 --- a/lnbits/wallets/lnbits.py +++ b/lnbits/wallets/lnbits.py @@ -123,7 +123,6 @@ class LNbitsWallet(Wallet): async with client.stream("GET", url) as r: async for line in r.aiter_lines(): if line.startswith("data:"): - try: data = json.loads(line[5:]) except json.decoder.JSONDecodeError: @@ -134,7 +133,7 @@ class LNbitsWallet(Wallet): yield data["payment_hash"] # payment_hash - except (OSError, httpx.ReadError, httpx.ConnectError): + except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout): pass print("lost connection to lnbits /payments/sse, retrying in 5 seconds") diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py index a346cd431..f8ff709c9 100644 --- a/lnbits/wallets/lntxbot.py +++ b/lnbits/wallets/lntxbot.py @@ -146,7 +146,7 @@ class LntxbotWallet(Wallet): data = json.loads(line[5:]) if "payment_hash" in data and data.get("msatoshi") > 0: yield data["payment_hash"] - except (OSError, httpx.ReadError): + except (OSError, httpx.ReadError, httpx.ReadTimeout, httpx.ConnectError): pass print("lost connection to lntxbot /payments/stream, retrying in 5 seconds") diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py index 5d0f024a5..0c81733e3 100644 --- a/lnbits/wallets/spark.py +++ b/lnbits/wallets/spark.py @@ -195,7 +195,7 @@ class SparkWallet(Wallet): data = json.loads(line[5:]) if "pay_index" in data and data.get("status") == "paid": yield data["label"] - except (OSError, httpx.ReadError, httpx.ConnectError): + except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout): pass print("lost connection to spark /stream, retrying in 5 seconds")