From 0e69359231ab3b04ccb94d453930b0064cb843d1 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Tue, 11 Nov 2025 16:11:17 +0100 Subject: [PATCH] websocket.py: back to original queue method --- internal_filesystem/lib/websocket.py | 6 +++++- tests/manual_test_lnbitswallet.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal_filesystem/lib/websocket.py b/internal_filesystem/lib/websocket.py index a2cde71b..7a4caba8 100644 --- a/internal_filesystem/lib/websocket.py +++ b/internal_filesystem/lib/websocket.py @@ -40,7 +40,10 @@ def _run_callback(callback, *args): """Add callback to queue for execution.""" try: _callback_queue.append((callback, args)) - #_log_debug(f"Queued callback {callback}, args={args}, queue size: {len(_callback_queue)}") + _log_debug(f"Queued callback {callback}, args={args}, queue size: {len(_callback_queue)}") + #if callback: + # print("Doing callback directly:") + # callback(*args) except IndexError: _log_error("ERROR: websocket.py callback queue full, dropping callback") @@ -252,6 +255,7 @@ class WebSocketApp: # Start callback processing task try: + # Make sure the queue is empty callback_task = asyncio.create_task(_process_callbacks_async()) _log_debug("Started callback processing task") except Exception as e: diff --git a/tests/manual_test_lnbitswallet.py b/tests/manual_test_lnbitswallet.py index 21c7af03..4abbe015 100644 --- a/tests/manual_test_lnbitswallet.py +++ b/tests/manual_test_lnbitswallet.py @@ -82,7 +82,7 @@ class TestLNBitsWallet(unittest.TestCase): self.wallet.start(self.redraw_balance_cb, self.redraw_payments_cb, self.redraw_static_receive_code_cb, self.error_callback) time.sleep(3) self.assertEqual(self.redraw_balance_cb_called, 1) - self.assertGreaterEqual(self.redraw_payments_cb_called, 3) + self.assertGreaterEqual(self.redraw_payments_cb_called, 1) # called once for all of them before_receive = self.redraw_payments_cb_called self.assertEqual(self.redraw_static_receive_code_cb_called, 0) # no static receive code so error 404 self.assertEqual(self.error_callback_called, 1)