LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Catch and log exceptions coming from the pay() task.

Browse source 
Change test to reproduce failure.
This commit is contained in:
Jonathan Moody 2022-09-15 16:53:40 -05:00 committed by Lex Berezhny
parent 718d046833
commit fd69401791
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lbry/wallet/usage_payment.py
View file

@ -1,5 +1,7 @@
import asyncio
import logging
import sys
import traceback
from lbry.error import (
ServerPaymentFeeAboveMaxAllowedError,
@ -27,6 +29,20 @@ class WalletServerPayer:
self.on_payment.listen(None, on_error=lambda e: logging.warning(e.args[0]))
async def pay(self):
while self.running:
try:
await self._pay()
except BaseException:
if self.running:
traceback.print_exception(*sys.exc_info())
log.warning("Caught exception: %s", sys.exc_info()[0].__name__)
else:
log.warning("Caught exception: %s", sys.exc_info()[0].__name__)
raise
#if not self.running:
# raise
async def _pay(self):
while self.running:
log.info("pay loop: before sleep")
await asyncio.sleep(self.payment_period)
@ -80,7 +96,16 @@ class WalletServerPayer:
self.wallet = wallet
self.running = True
self.task = asyncio.ensure_future(self.pay())
self.task.add_done_callback(lambda _: log.info("Stopping wallet server payments."))
self.task.add_done_callback(self._done_callback)
def _done_callback(self, f):
if f.cancelled():
reason = "Cancelled"
elif not self.running:
reason = "Stopped"
else:
reason = f'Exception: {f.exception()}'
log.info("Stopping wallet server payments. %s", reason)
async def stop(self):
if self.running:

9
tests/integration/blockchain/test_wallet_server_sessions.py
View file

@ -47,7 +47,8 @@ class TestSessions(IntegrationTestCase):
class TestUsagePayment(CommandTestCase):
async def test_single_server_payment(self):
wallet_pay_service = self.daemon.component_manager.get_component('wallet_server_payments')
wallet_pay_service.payment_period = 1
self.assertFalse(wallet_pay_service.running)
wallet_pay_service.payment_period = 0.1
# only starts with a positive max key fee
wallet_pay_service.max_fee = "0.0"
await wallet_pay_service.start(ledger=self.ledger, wallet=self.wallet)
@ -73,17 +74,17 @@ class TestUsagePayment(CommandTestCase):
self.assertEqual(features["daily_fee"], "1.1")
with self.assertRaises(ServerPaymentFeeAboveMaxAllowedError):
await asyncio.wait_for(wallet_pay_service.on_payment.first, timeout=30)
node.server.env.daily_fee = "1.0"
node.server.env.daily_fee = "0.1"
node.server.env.payment_address = address
LBRYElectrumX.set_server_features(node.server.env)
# self.daemon.jsonrpc_settings_set('lbryum_servers', [f"{node.hostname}:{node.port}"])
await self.daemon.jsonrpc_wallet_reconnect()
features = await self.ledger.network.get_server_features()
self.assertEqual(features["payment_address"], address)
self.assertEqual(features["daily_fee"], "1.0")
self.assertEqual(features["daily_fee"], "0.1")
tx = await asyncio.wait_for(wallet_pay_service.on_payment.first, timeout=30)
self.assertIsNotNone(await self.blockchain.get_raw_transaction(tx.id)) # verify its broadcasted
self.assertEqual(tx.outputs[0].amount, 100000000)
self.assertEqual(tx.outputs[0].amount, 10000000)
self.assertEqual(tx.outputs[0].get_address(self.ledger), address)